[EGIT] [tools/edi] master 01/01: build: Fix edi_build with meson to compile from scratch in one pass

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=86ae8c104f2af08fc96aa1aca599133fb1d79789

commit 86ae8c104f2af08fc96aa1aca599133fb1d79789
Author: Andy Williams 
Date:   Wed Oct 11 23:17:59 2017 +0100

build: Fix edi_build with meson to compile from scratch in one pass
---
 src/lib/edi_build_provider_meson.c | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/lib/edi_build_provider_meson.c 
b/src/lib/edi_build_provider_meson.c
index 6f11f14..8d53f16 100644
--- a/src/lib/edi_build_provider_meson.c
+++ b/src/lib/edi_build_provider_meson.c
@@ -79,12 +79,18 @@ _meson_project_runnable_is(const char *path)
return ecore_file_can_exec(path);
 }
 
+static const char *
+_meson_ninja_cmd(Meson_Data *md, const char *arg)
+{
+   return eina_slstr_printf("ninja -C %s %s", md->fulldir, arg ?: "");
+}
+ 
 static void
 _meson_ninja_do(Meson_Data *md, const char *arg)
 {
const char *cmd;
 
-   cmd = eina_slstr_printf("ninja -C %s %s", md->fulldir, arg ?: "");
+   cmd = _meson_ninja_cmd(md, arg);
if (arg && !strcmp(arg, "clean"))
  edi_exe_notify("edi_clean", cmd);
else
@@ -100,7 +106,6 @@ _meson_prepare_end(void *data, int evtype EINA_UNUSED, void 
*evinfo)
if (!ev->exe) return ECORE_CALLBACK_RENEW;
if (ecore_exe_data_get(ev->exe) != me) return ECORE_CALLBACK_RENEW;
 
-   _meson_ninja_do(me, NULL);
return ECORE_CALLBACK_RENEW;
 }
 
@@ -113,11 +118,12 @@ _meson_prepare(Meson_Data *md)
if (_meson_configured_check(md->fulldir)) return EINA_TRUE;
if (chdir(md->basedir) != 0) return EINA_FALSE;
 
-   cmd = eina_slstr_printf("meson %s", md->builddir);
+   cmd = eina_slstr_printf("meson %s && %s", md->builddir, 
_meson_ninja_cmd(md, ""));
+
exe = ecore_exe_pipe_run(cmd,
 ECORE_EXE_PIPE_READ_LINE_BUFFERED | 
ECORE_EXE_PIPE_READ |
 ECORE_EXE_PIPE_ERROR_LINE_BUFFERED | 
ECORE_EXE_PIPE_ERROR |
-ECORE_EXE_PIPE_WRITE /*| ECORE_EXE_USE_SH*/, md);
+ECORE_EXE_PIPE_WRITE | ECORE_EXE_USE_SH, md);
 
if (!exe) return EINA_FALSE;
ecore_event_handler_add(ECORE_EXE_EVENT_DEL, _meson_prepare_end, md);

-- 

[EGIT] [tools/edi] master 01/02: l10n: Update strings to remove non-translation and trailing symbols we can add in code

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=49b8b3f5b9423869f5ff0946fa4c0b43195174c4

commit 49b8b3f5b9423869f5ff0946fa4c0b43195174c4
Author: Andy Williams 
Date:   Wed Oct 11 16:16:12 2017 +0100

l10n: Update strings to remove non-translation and trailing symbols we can 
add in code
---
 po/edi.pot | 39 --
 src/bin/editor/edi_editor.c|  4 ++--
 src/bin/editor/edi_editor_search.c |  4 ++--
 src/bin/mainview/edi_mainview.c|  4 ++--
 src/bin/screens/edi_settings.c |  6 +++---
 src/bin/screens/edi_welcome.c  |  2 +-
 6 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/po/edi.pot b/po/edi.pot
index 93a7dc1..c5bf947 100644
--- a/po/edi.pot
+++ b/po/edi.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edi 0.6.99\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-10-03 15:21+0100\n"
+"POT-Creation-Date: 2017-10-11 15:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -44,8 +44,8 @@ msgstr ""
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:585 src/bin/editor/edi_editor_search.c:502
-#: src/bin/edi_main.c:428
+#: src/bin/mainview/edi_mainview.c:585 src/bin/mainview/edi_mainview.c:656
+#: src/bin/editor/edi_editor_search.c:502 src/bin/edi_main.c:428
 msgid "Search"
 msgstr ""
 
@@ -69,15 +69,8 @@ msgstr ""
 msgid "Replace all occurences of text within the whole project."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:656
-msgid "Search: "
-msgstr ""
-
-#: src/bin/mainview/edi_mainview.c:669
-msgid "Replace: "
-msgstr ""
-
-#: src/bin/mainview/edi_mainview.c:695 src/bin/editor/edi_editor_search.c:510
+#: src/bin/mainview/edi_mainview.c:669 src/bin/mainview/edi_mainview.c:695
+#: src/bin/editor/edi_editor_search.c:510
 msgid "Replace"
 msgstr ""
 
@@ -143,20 +136,12 @@ msgstr ""
 msgid "Line:%d, Column:%d"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:940
-msgid "WIN"
-msgstr ""
-
-#: src/bin/editor/edi_editor.c:942
-msgid "UNIX"
-msgstr ""
-
 #: src/bin/editor/edi_editor_search.c:442
-msgid "Search term:"
+msgid "Search term"
 msgstr ""
 
 #: src/bin/editor/edi_editor_search.c:465
-msgid "Replace term:"
+msgid "Replace term"
 msgstr ""
 
 #: src/bin/editor/edi_editor_search.c:492
@@ -262,7 +247,7 @@ msgid "Welcome to Edi"
 msgstr ""
 
 #: src/bin/screens/edi_welcome.c:675
-msgid "Recent Projects:"
+msgid "Recent Projects"
 msgstr ""
 
 #: src/bin/screens/edi_welcome.c:684
@@ -382,11 +367,11 @@ msgid "Project Settings"
 msgstr ""
 
 #: src/bin/screens/edi_settings.c:443
-msgid "Author Name: "
+msgid "Author Name"
 msgstr ""
 
 #: src/bin/screens/edi_settings.c:468
-msgid "Author E-mail: "
+msgid "Author E-mail"
 msgstr ""
 
 #: src/bin/screens/edi_settings.c:490
@@ -394,7 +379,7 @@ msgid "Source Control"
 msgstr ""
 
 #: src/bin/screens/edi_settings.c:509
-msgid "Remote URL:"
+msgid "Remote URL"
 msgstr ""
 
 #: src/bin/screens/edi_settings.c:557 src/bin/screens/edi_settings.c:647
@@ -542,7 +527,7 @@ msgstr ""
 msgid "Untracked changes"
 msgstr ""
 
-#: src/bin/edi_filepanel.c:1072 src/bin/edi_main.c:1159
+#: src/bin/edi_filepanel.c:1074 src/bin/edi_main.c:1159
 msgid "Find file"
 msgstr ""
 
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 53f1b4d..67754a6 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -937,9 +937,9 @@ _edi_editor_statusbar_add(Evas_Object *panel, Edi_Editor 
*editor, Edi_Mainview_I
lines = elm_label_add(panel);
code = elm_code_widget_code_get(editor->entry);
if (elm_code_file_line_ending_get(code->file) == 
ELM_CODE_FILE_LINE_ENDING_WINDOWS)
- elm_object_text_set(lines, _("WIN"));
+ elm_object_text_set(lines, "WIN");
else
- elm_object_text_set(lines, _("UNIX"));
+ elm_object_text_set(lines, "UNIX");
evas_object_size_hint_align_set(lines, 0.0, 0.5);
evas_object_size_hint_weight_set(lines, EVAS_HINT_EXPAND, 0.0);
elm_box_pack_end(panel, lines);
diff --git a/src/bin/editor/edi_editor_search.c 
b/src/bin/editor/edi_editor_search.c
index dfb89c2..ae6284d 100644
--- a/src/bin/editor/edi_editor_search.c
+++ b/src/bin/editor/edi_editor_search.c
@@ -439,7 +439,7 @@ edi_editor_search_ad

[EGIT] [tools/edi] master 02/02: l10n: latest strings from new features

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=014557e0c79fe79bfe691923bf28d5cb4aee1ac7

commit 014557e0c79fe79bfe691923bf28d5cb4aee1ac7
Author: Andy Williams 
Date:   Wed Oct 11 16:20:26 2017 +0100

l10n: latest strings from new features
---
 po/edi.pot | 150 +++--
 1 file changed, 77 insertions(+), 73 deletions(-)

diff --git a/po/edi.pot b/po/edi.pot
index c5bf947..74b37b8 100644
--- a/po/edi.pot
+++ b/po/edi.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: edi 0.6.99\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-10-11 15:00+0100\n"
+"POT-Creation-Date: 2017-10-11 16:18+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -16,60 +16,60 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/bin/mainview/edi_mainview.c:490
+#: src/bin/mainview/edi_mainview.c:567
 #: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:121
 #: src/bin/screens/edi_screens.c:162 src/bin/screens/edi_welcome.c:70
 #: src/bin/screens/edi_file_screens.c:29 src/bin/edi_scm_ui.c:105
 msgid "OK"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:517
+#: src/bin/mainview/edi_mainview.c:594
 msgid "Please enter a valid search term."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:551
+#: src/bin/mainview/edi_mainview.c:628
 msgid "Search for (whole project)"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:557
+#: src/bin/mainview/edi_mainview.c:634
 msgid "Please enter a term to search for within the whole project."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:579 src/bin/mainview/edi_mainview.c:688
-#: src/bin/mainview/edi_mainview_panel.c:700
+#: src/bin/mainview/edi_mainview.c:656 src/bin/mainview/edi_mainview.c:765
+#: src/bin/mainview/edi_mainview_panel.c:712
 #: src/bin/editor/edi_editor_search.c:518
 #: src/bin/screens/edi_file_screens.c:232
 #: src/bin/screens/edi_file_screens.c:293
-#: src/bin/screens/edi_file_screens.c:354 src/bin/edi_scm_ui.c:733
+#: src/bin/screens/edi_file_screens.c:354 src/bin/edi_scm_ui.c:772
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:585 src/bin/mainview/edi_mainview.c:656
+#: src/bin/mainview/edi_mainview.c:662 src/bin/mainview/edi_mainview.c:733
 #: src/bin/editor/edi_editor_search.c:502 src/bin/edi_main.c:428
 msgid "Search"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:605
+#: src/bin/mainview/edi_mainview.c:682
 msgid "Please enter a valid search string."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:612
+#: src/bin/mainview/edi_mainview.c:689
 msgid "Please enter a valid replace string."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:618
+#: src/bin/mainview/edi_mainview.c:695
 msgid "Strings cannot match."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:640
-msgid "Search & Replace"
+#: src/bin/mainview/edi_mainview.c:717
+msgid "Search & Replace"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:645
+#: src/bin/mainview/edi_mainview.c:722
 msgid "Replace all occurences of text within the whole project."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:669 src/bin/mainview/edi_mainview.c:695
+#: src/bin/mainview/edi_mainview.c:746 src/bin/mainview/edi_mainview.c:772
 #: src/bin/editor/edi_editor_search.c:510
 msgid "Replace"
 msgstr ""
@@ -84,11 +84,11 @@ msgid ""
 "menu options."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview_panel.c:674
+#: src/bin/mainview/edi_mainview_panel.c:686
 msgid "Enter line number"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview_panel.c:706
+#: src/bin/mainview/edi_mainview_panel.c:718
 msgid "Go"
 msgstr ""
 
@@ -108,8 +108,8 @@ msgstr ""
 msgid "No help available for this term"
 msgstr ""
 
-#: src/bin/editor/edi_editor_documentation.c:162 src/bin/edi_main.c:1143
-#: src/bin/edi_main.c:1223
+#: src/bin/editor/edi_editor_documentation.c:162 src/bin/edi_main.c:1150
+#: src/bin/edi_main.c:1231
 msgid "Close"
 msgstr ""
 
@@ -398,7 +398,7 @@ msgstr ""
 msgid "Edi Settings"
 msgstr ""
 
-#: src/bin/screens/edi_settings.c:638 src/bin/edi_main.c:1178
+#: src/bin/screens/edi_settings.c:638 src/bin/edi_main.c:1186
 msgid "Project"
 msgstr ""
 
@@ -421,7 +421,7 @@ msgstr ""
 msgid "EDI's lovely authors"
 msgstr ""
 
-#: src/bin/screens/edi_about.c:126 

[EGIT] [website/www] master 01/01: Redirect to markdown start pages where they exist

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=256e23b8a0f35f0657d379ad668406c56d5f9f74

commit 256e23b8a0f35f0657d379ad668406c56d5f9f74
Author: Andy Williams 
Date:   Wed Oct 11 15:01:25 2017 +0100

Redirect to markdown start pages where they exist
---
 public_html/inc/pageutils.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public_html/inc/pageutils.php b/public_html/inc/pageutils.php
index 9b016620..69f4a09f 100644
--- a/public_html/inc/pageutils.php
+++ b/public_html/inc/pageutils.php
@@ -71,6 +71,9 @@ function getID($param='id',$clean=true){
 if(page_exists($id.$conf['start'])){
 // start page inside namespace
 $id = $id.$conf['start'];
+}elseif(page_exists($id.$conf['start'].'.md')){
+// start markdown page inside namespace
+$id = $id.$conf['start'].'.md';
 }elseif(page_exists($id.noNS(cleanID($id{
 // page named like the NS inside the NS
 $id = $id.noNS(cleanID($id));

-- 

[EGIT] [website/www] master 01/02: apply syntax highlighting to markdown formatted docs

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=8265721765383a04ad9266a4545e84dcfe30f708

commit 8265721765383a04ad9266a4545e84dcfe30f708
Author: Andy Williams 
Date:   Tue Oct 10 21:44:22 2017 +0100

apply syntax highlighting to markdown formatted docs
---
 public_html/lib/plugins/markdownextra/markdown.php | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/public_html/lib/plugins/markdownextra/markdown.php 
b/public_html/lib/plugins/markdownextra/markdown.php
index 0edba0f3..cb1ed3aa 100755
--- a/public_html/lib/plugins/markdownextra/markdown.php
+++ b/public_html/lib/plugins/markdownextra/markdown.php
@@ -2968,14 +2968,17 @@ class MarkdownExtra_Parser extends Markdown_Parser {
if ($classname != "") {
if ($classname{0} == '.')
$classname = substr($classname, 1);
-   $attr_str = ' 
class="'.$this->code_class_prefix.$classname.'"';
+   $attr_str = ' class="code 
'.$this->code_class_prefix.$classname.'"';
} else {
$attr_str = 
$this->doExtraAttributes($this->code_attr_on_pre ? "pre" : "code", $attrs);
}
$pre_attr_str  = $this->code_attr_on_pre ? $attr_str : '';
$code_attr_str = $this->code_attr_on_pre ? '' : $attr_str;
-   $codeblock  = 
"$codeblock";
-   
+
+   // apply syntax metadata to the code block
+   $syntaxcode = p_xhtml_cached_geshi($codeblock, $classname, 
null);
+   $codeblock  = 
"$syntaxcode";
+
return "\n\n".$this->hashBlock($codeblock)."\n\n";
}
function _doFencedCodeBlocks_newlines($matches) {

-- 

[EGIT] [website/www] master 02/02: Pull plugin from newer repo

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=698e9465a71645f2b286e8c5d7d0e2462d59dfb5

commit 698e9465a71645f2b286e8c5d7d0e2462d59dfb5
Author: Andy Williams 
Date:   Tue Oct 10 22:19:50 2017 +0100

Pull plugin from newer repo
---
 public_html/lib/plugins/markdownextra/README.md | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/public_html/lib/plugins/markdownextra/README.md 
b/public_html/lib/plugins/markdownextra/README.md
index 3346dde8..dadba63e 100644
--- a/public_html/lib/plugins/markdownextra/README.md
+++ b/public_html/lib/plugins/markdownextra/README.md
@@ -15,7 +15,7 @@
 
 ##Download and Installation
 
-Download and install the plugin using the Plugin Manager using the following 
URL. Refer to [[:Plugins]] on how to install plugins manually.
+Download and install the plugin using the Plugin Manager using the URL 
https://github.com/ajwillia-ms/dokuwiki-plugin-markdownextra/tarball/master . 
Refer to [[:Plugins]] on how to install plugins manually.
 
 
 
@@ -27,8 +27,10 @@ If the page name ends with ''.md'' suffix, it gets 
automatically parsed using PH
 Header 1
 
 
-~~~
-some code
+~~~ .c
+int method() {
+  return 5;
+}
 ~~~
 
 Paragraph
@@ -60,4 +62,4 @@ Front matter is a text block at the top of dokuwiki page with 
.md suffix. It beg
 I love this markdown extra plugin, the best feature is .md suffix. And I love 
[tag plugin](https://www.dokuwiki.org/plugin:tag) too, but I can't use it with 
page with .md suffix as {{tag>tat1 tag2 tag3}} syntax will not work within 
. So I added this front matter feature.
 
 
-For syntax, refer to http://michelf.com/projects/php-markdown/extra/
\ No newline at end of file
+For syntax, refer to http://michelf.com/projects/php-markdown/extra/

-- 

[EGIT] [tools/edi] master 01/01: Fix meson build for non-dev libclang

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=bf182698be2708d18035404cacf69f8770aae7b3

commit bf182698be2708d18035404cacf69f8770aae7b3
Author: Andy Williams 
Date:   Tue Oct 10 15:55:31 2017 +0100

Fix meson build for non-dev libclang
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index e511f18..dc4350e 100644
--- a/meson.build
+++ b/meson.build
@@ -39,7 +39,7 @@ else
   config_h.set_quoted('BEAR_COMMAND', '')
 endif
 
-if get_option('libclang') == true
+if get_option('libclang') == true and cc.has_header('clang-c/Index.h')
   clang = cc.find_library('clang', dirs : ['/usr/local/opt/llvm/lib'])
 
   clang_include_dir_command = 
run_command(find_program('scripts/clang_include_dir.sh'))

-- 

[EGIT] [website/www] master 01/01: Work with recent PHP defaults

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=d7b837918b6cf936092b7c08113e45fe0444c0d3

commit d7b837918b6cf936092b7c08113e45fe0444c0d3
Author: Andy Williams 
Date:   Mon Oct 9 17:55:04 2017 +0100

Work with recent PHP defaults
---
 public_html/inc/lessc.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/inc/lessc.inc.php b/public_html/inc/lessc.inc.php
index 3d0ed768..64dbcfef 100644
--- a/public_html/inc/lessc.inc.php
+++ b/public_html/inc/lessc.inc.php
@@ -51,7 +51,7 @@ class lessc {
public $parentSelector = '&';
 
public $importDisabled = false;
-   public $importDir = '';
+   public $importDir = [];
 
protected $numberPrecision = null;
 

-- 

[EGIT] [website/www-content] master 01/01: edi: Update download link now we're on download.e.org

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=c2d1865d409591020a0e6801f14c9087412c6e7c

commit c2d1865d409591020a0e6801f14c9087412c6e7c
Author: Andy Williams 
Date:   Mon Oct 9 17:46:05 2017 +0100

edi: Update download link now we're on download.e.org
---
 pages/about-edi.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pages/about-edi.txt b/pages/about-edi.txt
index 1345ac9d..6140da12 100644
--- a/pages/about-edi.txt
+++ b/pages/about-edi.txt
@@ -1,7 +1,7 @@
 ~~Title: About Edi~~
  Edi (The Enlightenment IDE) 
 
-[[https://github.com/ajwillia-ms/edi/releases|Download Edi pre-release here]]
+[[download|Download the latest Edi release at our downloads page]]
 
 {{:edi-logo.png?nolink |}}
 

-- 

[EGIT] [tools/edi] master 01/01: missing dirs mess up build

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=b586e84474edfafae2f48f420923f9bd0a5a066b

commit b586e84474edfafae2f48f420923f9bd0a5a066b
Author: Andy Williams 
Date:   Fri Oct 6 16:00:00 2017 +0100

missing dirs mess up build
---
 src/bin/meson.build | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/meson.build b/src/bin/meson.build
index d1c1de7..b249b28 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -32,8 +32,10 @@ if get_option('libclang') == true
deps += [clang]
 
clang_build_include_dir_command = 
run_command(find_program('../../scripts/clang_build_include_dir.sh'))
-   clang_build_include_dir = clang_include_dir_command.stdout().strip()
-   incls += include_directories(clang_build_include_dir)
+   clang_build_include_dir = clang_build_include_dir_command.stdout().strip()
+   if clang_build_include_dir != ''
+  incls += include_directories(clang_build_include_dir)
+   endif
 endif
 
 executable('edi', src,

-- 

[EGIT] [tools/edi] master 01/01: Fix meson issues for OSX

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=09ce5493cd93847498b731aedb96adc6d2f77df6

commit 09ce5493cd93847498b731aedb96adc6d2f77df6
Author: Andy Williams 
Date:   Fri Oct 6 15:49:23 2017 +0100

Fix meson issues for OSX
---
 scripts/clang_build_include_dir.sh | 6 ++
 src/bin/meson.build| 6 ++
 2 files changed, 12 insertions(+)

diff --git a/scripts/clang_build_include_dir.sh 
b/scripts/clang_build_include_dir.sh
new file mode 100755
index 000..a5b320e
--- /dev/null
+++ b/scripts/clang_build_include_dir.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [[ -d /usr/local/opt/llvm ]]; then
+  echo "/usr/local/opt/llvm/include"
+fi
+
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 829d938..d1c1de7 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -26,13 +26,19 @@ foreach package : packages
 endforeach
 
 deps = [elm, edi_lib, intl]
+incls = []
 
 if get_option('libclang') == true
deps += [clang]
+
+   clang_build_include_dir_command = 
run_command(find_program('../../scripts/clang_build_include_dir.sh'))
+   clang_build_include_dir = clang_include_dir_command.stdout().strip()
+   incls += include_directories(clang_build_include_dir)
 endif
 
 executable('edi', src,
   dependencies : deps,
+  include_directories : incls,
   install : true
 )
 

-- 

[EGIT] [tools/edi] master 01/01: Fixing up linux again - need a better solution for OSX as meson bails

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=3421d668f0be6dd9153a731c348a2be7e7b2a8ff

commit 3421d668f0be6dd9153a731c348a2be7e7b2a8ff
Author: Andy Williams 
Date:   Fri Oct 6 12:41:33 2017 +0100

Fixing up linux again - need a better solution for OSX as meson bails
---
 meson.build | 2 +-
 src/bin/meson.build | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 22bce40..e511f18 100644
--- a/meson.build
+++ b/meson.build
@@ -30,7 +30,7 @@ cc = meson.get_compiler('c')
 
 config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'), 
'--libs', '--cflags', 'elementary').stdout().strip())
 
-intl = cc.find_library('intl')
+intl = cc.find_library('intl', required : false)
 
 bear = find_program('bear', required : false)
 if get_option('bear') == true and bear.found()
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 50844d0..829d938 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -26,16 +26,13 @@ foreach package : packages
 endforeach
 
 deps = [elm, edi_lib, intl]
-libs = []
 
 if get_option('libclang') == true
deps += [clang]
-   libs += include_directories('/usr/local/opt/llvm/include')
 endif
 
 executable('edi', src,
   dependencies : deps,
-  include_directories : libs,
   install : true
 )
 

-- 

[EGIT] [tools/edi] edi-0.6 01/01: filepanel: don't update status and scm etc for hidden files

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=b54b073bdc6be9923b997275cf6fa9cabbdaea75

commit b54b073bdc6be9923b997275cf6fa9cabbdaea75
Author: Andy Williams 
Date:   Thu Oct 5 00:37:43 2017 +0100

filepanel: don't update status and scm etc for hidden files
---
 src/bin/edi_filepanel.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 7ad0f7c..91aca51 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -947,7 +947,9 @@ _file_listing_updated(void *data EINA_UNUSED, int type 
EINA_UNUSED,
Elm_Object_Item *parent_it;
 
dir = ecore_file_dir_get(ev->filename);
-   if (strncmp(edi_project_get(), dir, strlen(edi_project_get(
+   if (strncmp(edi_project_get(), dir, strlen(edi_project_get())) ||
+   ev->filename[strlen(edi_project_get()) + 1] == '.' ||
+   _file_path_hidden(ev->filename, EINA_FALSE))
  return;
 
parent_it = _file_listing_item_find(dir);

-- 

[EGIT] [tools/edi] master 01/01: filepanel: don't update status and scm etc for hidden files

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=66ef93730b898ac10e5b9a061c86dd999f92d966

commit 66ef93730b898ac10e5b9a061c86dd999f92d966
Author: Andy Williams 
Date:   Thu Oct 5 00:37:43 2017 +0100

filepanel: don't update status and scm etc for hidden files
---
 src/bin/edi_filepanel.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index da644cd..64a838d 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -950,7 +950,9 @@ _file_listing_updated(void *data EINA_UNUSED, int type 
EINA_UNUSED,
Elm_Object_Item *parent_it;
 
dir = ecore_file_dir_get(ev->filename);
-   if (strncmp(edi_project_get(), dir, strlen(edi_project_get(
+   if (strncmp(edi_project_get(), dir, strlen(edi_project_get())) ||
+   ev->filename[strlen(edi_project_get()) + 1] == '.' ||
+   _file_path_hidden(ev->filename, EINA_FALSE))
  return;
 
parent_it = _file_listing_item_find(dir);

-- 

[EGIT] [tools/edi] master 01/01: And link libintl

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=21d73fd38bfcacf6670046353d96080173895161

commit 21d73fd38bfcacf6670046353d96080173895161
Author: Andy Williams 
Date:   Thu Oct 5 00:09:30 2017 +0100

And link libintl
---
 meson.build | 2 ++
 src/bin/meson.build | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index d66e3ea..22bce40 100644
--- a/meson.build
+++ b/meson.build
@@ -30,6 +30,8 @@ cc = meson.get_compiler('c')
 
 config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'), 
'--libs', '--cflags', 'elementary').stdout().strip())
 
+intl = cc.find_library('intl')
+
 bear = find_program('bear', required : false)
 if get_option('bear') == true and bear.found()
   config_h.set_quoted('BEAR_COMMAND', 'bear')
diff --git a/src/bin/meson.build b/src/bin/meson.build
index adfa5d8..50844d0 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -25,7 +25,7 @@ foreach package : packages
subdir(package)
 endforeach
 
-deps = [elm, edi_lib]
+deps = [elm, edi_lib, intl]
 libs = []
 
 if get_option('libclang') == true
@@ -46,11 +46,11 @@ edi_scm_src = files([
 ])
 
 executable('edi_scm', edi_scm_src,
-  dependencies : [elm, edi_lib],
+  dependencies : [elm, edi_lib, intl],
   install : true
 )
 
 executable('edi_build', 'edi_build_main.c',
-  dependencies : [elm, edi_lib],
+  dependencies : [elm, edi_lib, intl],
   install : true
 )

-- 

[EGIT] [tools/edi] master 02/02: Ignore build dir

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=3cbabf0d495a38a6b3ccc8fd0365c8f3bb798cfd

commit 3cbabf0d495a38a6b3ccc8fd0365c8f3bb798cfd
Author: Andy Williams 
Date:   Wed Oct 4 23:53:12 2017 +0100

Ignore build dir
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 35bc462..bd433af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 .dirstamp
 .edi
 
+/build
 /src/bin/edi
 /src/bin/edi_build
 /src/bin/edi_scm

-- 

[EGIT] [tools/edi] master 01/02: Fix clang lookup dirs on osx

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=dda9a59fc4e1bd24811f413cfa025f6eb6f957ce

commit dda9a59fc4e1bd24811f413cfa025f6eb6f957ce
Author: Andy Williams 
Date:   Wed Oct 4 23:52:29 2017 +0100

Fix clang lookup dirs on osx
---
 meson.build  | 2 +-
 scripts/clang_include_dir.sh | 7 ++-
 src/bin/meson.build  | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 69ce5ba..d66e3ea 100644
--- a/meson.build
+++ b/meson.build
@@ -38,7 +38,7 @@ else
 endif
 
 if get_option('libclang') == true
-  clang = cc.find_library('clang', dirs : 
['/Library/Developer/CommandLineTools/usr/lib/'])
+  clang = cc.find_library('clang', dirs : ['/usr/local/opt/llvm/lib'])
 
   clang_include_dir_command = 
run_command(find_program('scripts/clang_include_dir.sh'))
   clang_include_dir = clang_include_dir_command.stdout().strip()
diff --git a/scripts/clang_include_dir.sh b/scripts/clang_include_dir.sh
index f70a780..f3447ea 100755
--- a/scripts/clang_include_dir.sh
+++ b/scripts/clang_include_dir.sh
@@ -1,3 +1,8 @@
 #!/bin/sh
 
-clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang
+BINDIR=
+if [[ -d /usr/local/opt/llvm ]]; then
+  BINDIR="/usr/local/opt/llvm/bin/"
+fi
+
+${BINDIR}clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang
diff --git a/src/bin/meson.build b/src/bin/meson.build
index 3b1ef6c..adfa5d8 100644
--- a/src/bin/meson.build
+++ b/src/bin/meson.build
@@ -26,13 +26,16 @@ foreach package : packages
 endforeach
 
 deps = [elm, edi_lib]
+libs = []
 
 if get_option('libclang') == true
deps += [clang]
+   libs += include_directories('/usr/local/opt/llvm/include')
 endif
 
 executable('edi', src,
   dependencies : deps,
+  include_directories : libs,
   install : true
 )
 

-- 

[EGIT] [tools/edi] master 01/01: Fix build on OSX with clang but no bear

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=2e69a791b7734ae112f745cbfc6b3673ddfd7136

commit 2e69a791b7734ae112f745cbfc6b3673ddfd7136
Author: Andy Williams 
Date:   Wed Oct 4 23:06:27 2017 +0100

Fix build on OSX with clang but no bear
---
 meson.build  | 6 +++---
 scripts/clang_include_dir.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index 2cf1083..69ce5ba 100644
--- a/meson.build
+++ b/meson.build
@@ -30,15 +30,15 @@ cc = meson.get_compiler('c')
 
 config_h.set_quoted('EFL_CFLAGS', run_command(find_program('pkg-config'), 
'--libs', '--cflags', 'elementary').stdout().strip())
 
-if get_option('bear') == true
-  bear = find_program('bear')
+bear = find_program('bear', required : false)
+if get_option('bear') == true and bear.found()
   config_h.set_quoted('BEAR_COMMAND', 'bear')
 else
   config_h.set_quoted('BEAR_COMMAND', '')
 endif
 
 if get_option('libclang') == true
-  clang = cc.find_library('clang')
+  clang = cc.find_library('clang', dirs : 
['/Library/Developer/CommandLineTools/usr/lib/'])
 
   clang_include_dir_command = 
run_command(find_program('scripts/clang_include_dir.sh'))
   clang_include_dir = clang_include_dir_command.stdout().strip()
diff --git a/scripts/clang_include_dir.sh b/scripts/clang_include_dir.sh
index a5b4ce5..f70a780 100755
--- a/scripts/clang_include_dir.sh
+++ b/scripts/clang_include_dir.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-clang -E - -v < /dev/null 2>&1 | grep "^ /usr" | grep clang
+clang -E - -v < /dev/null 2>&1 | grep "^ /" | grep clang

-- 

[EGIT] [tools/edi] master 02/02: Update text for SCM changes

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=10d706a08c0b3327e203328a5f6dff7e0fb0e153

commit 10d706a08c0b3327e203328a5f6dff7e0fb0e153
Author: Andy Williams 
Date:   Tue Oct 3 15:22:18 2017 +0100

Update text for SCM changes
---
 po/POTFILES.in   |   3 +-
 po/edi.pot   | 383 ---
 src/bin/edi_scm_ui.c |   2 +-
 3 files changed, 215 insertions(+), 173 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index d3b6fa9..8ad81e7 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -11,7 +11,6 @@ src/bin/screens/edi_file_screens.c
 src/bin/screens/edi_settings.c
 src/bin/screens/edi_about.c
 src/bin/screens/edi_settings_font.c
-src/bin/screens/edi_scm_screens.c
 src/bin/edi_debugpanel.c
 src/bin/language/edi_language_provider_c.c
 src/bin/language/edi_language_provider_python.c
@@ -23,5 +22,7 @@ src/bin/edi_file.c
 src/bin/edi_main.c
 src/bin/edi_logpanel.c
 src/bin/edi_searchpanel.c
+src/bin/edi_scm_main.c
+src/bin/edi_scm_ui.c
 src/bin/edi_config.c
 src/bin/edi_consolepanel.c
diff --git a/po/edi.pot b/po/edi.pot
index 9287d7a..93a7dc1 100644
--- a/po/edi.pot
+++ b/po/edi.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: edi 0.6.0\n"
+"Project-Id-Version: edi 0.6.99\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-09-26 13:49+0100\n"
+"POT-Creation-Date: 2017-10-03 15:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -16,28 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: src/bin/mainview/edi_mainview.c:490
+#: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:121
+#: src/bin/screens/edi_screens.c:162 src/bin/screens/edi_welcome.c:70
+#: src/bin/screens/edi_file_screens.c:29 src/bin/edi_scm_ui.c:105
+msgid "OK"
+msgstr ""
+
 #: src/bin/mainview/edi_mainview.c:517
+msgid "Please enter a valid search term."
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:551
 msgid "Search for (whole project)"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:526
-msgid "Please enter a term to search for within the whole project."
+#: src/bin/mainview/edi_mainview.c:557
+msgid "Please enter a term to search for within the whole project."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:554
+#: src/bin/mainview/edi_mainview.c:579 src/bin/mainview/edi_mainview.c:688
 #: src/bin/mainview/edi_mainview_panel.c:700
 #: src/bin/editor/edi_editor_search.c:518
-#: src/bin/screens/edi_file_screens.c:222
-#: src/bin/screens/edi_file_screens.c:283
-#: src/bin/screens/edi_file_screens.c:344 src/bin/screens/edi_scm_screens.c:493
+#: src/bin/screens/edi_file_screens.c:232
+#: src/bin/screens/edi_file_screens.c:293
+#: src/bin/screens/edi_file_screens.c:354 src/bin/edi_scm_ui.c:733
 msgid "Cancel"
 msgstr ""
 
-#: src/bin/mainview/edi_mainview.c:560 src/bin/editor/edi_editor_search.c:502
-#: src/bin/edi_main.c:429
+#: src/bin/mainview/edi_mainview.c:585 src/bin/editor/edi_editor_search.c:502
+#: src/bin/edi_main.c:428
 msgid "Search"
 msgstr ""
 
+#: src/bin/mainview/edi_mainview.c:605
+msgid "Please enter a valid search string."
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:612
+msgid "Please enter a valid replace string."
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:618
+msgid "Strings cannot match."
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:640
+msgid "Search & Replace"
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:645
+msgid "Replace all occurences of text within the whole project."
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:656
+msgid "Search: "
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:669
+msgid "Replace: "
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:695 src/bin/editor/edi_editor_search.c:510
+msgid "Replace"
+msgstr ""
+
 #: src/bin/mainview/edi_mainview_panel.c:415
 msgid "Unrecognized file type"
 msgstr ""
@@ -48,12 +91,6 @@ msgid ""
 "menu options."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:121
-#: src/bin/screens/edi_welcome.c:70 src/bin/screens/edi_file_screens.c:29
-#: src/bin/screens/edi_scm_screens.c:36 src/bin/screens/edi_scm_screens.c:531
-msgid "OK"
-msgstr ""
-
 #: src/bin/mainview/edi_mainview_panel.c:674
 msgid "Enter line number"
 msgstr ""
@@ -78,8 +115,8 @@ msgstr ""
 msgid 

[EGIT] [tools/edi] master 01/02: scm_ui: Show user icon or a fallback, not both

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=2bac1157dbda18cd7913cdc57fb46fc40302f63f

commit 2bac1157dbda18cd7913cdc57fb46fc40302f63f
Author: Andy Williams 
Date:   Tue Oct 3 14:57:05 2017 +0100

scm_ui: Show user icon or a fallback, not both
---
 src/bin/edi_scm_ui.c | 51 +++
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index 7b8bac2..57c5799 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -7,6 +7,8 @@
 #include "edi_scm_ui.h"
 #include "edi_private.h"
 
+#define DEFAULT_USER_ICON "applications-development"
+
 typedef struct _Edi_Scm_Ui {
Ecore_Thread *thread;
Eio_Monitor  *monitor;
@@ -64,17 +66,18 @@ _edi_scm_ui_screens_avatar_load(Evas_Object *image, const 
char *email)
cachedir = dirname(tmp);
tmp2 = strdup(tmp);
cacheparentdir = dirname(tmp2);
-   if (!ecore_file_exists(cacheparentdir) && !ecore_file_mkdir(cacheparentdir))
- goto clear;
-
-   if (!ecore_file_exists(cachedir) && !ecore_file_mkdir(cachedir))
- goto clear;
-
-   ecore_file_download(edi_scm_avatar_url_get(email), cache,
-   _edi_scm_ui_screens_avatar_download_complete, NULL,
-   image, NULL);
+   if ((ecore_file_exists(cacheparentdir) || ecore_file_mkdir(cacheparentdir))
+   && (ecore_file_exists(cachedir) || ecore_file_mkdir(cachedir)))
+ {
+ecore_file_download(edi_scm_avatar_url_get(email), cache,
+_edi_scm_ui_screens_avatar_download_complete, NULL,
+image, NULL);
+ }
+   else
+ {
+elm_icon_standard_set(image, DEFAULT_USER_ICON);
+ }
 
-clear:
free(tmp2);
free(tmp);
 }
@@ -509,7 +512,6 @@ edi_scm_ui_add(Evas_Object *parent)
 {
Evas_Object *box, *frame, *hbox, *cbox, *label, *avatar, *input, *button;
Evas_Object *table, *rect, *list, *pbox, *check, *sep;
-   Evas_Object *logo;
Elm_Code_Widget *entry;
Elm_Code *code;
Eina_Strbuf *string;
@@ -556,15 +558,12 @@ edi_scm_ui_add(Evas_Object *parent)
evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(hbox);
 
-   logo = elm_image_add(parent);
-   string = eina_strbuf_new();
-   eina_strbuf_append_printf(string, "%s/images/welcome.png", 
PACKAGE_DATA_DIR);
-   elm_image_file_set(logo, eina_strbuf_string_get(string), NULL);
-   evas_object_size_hint_min_set(logo, 48 * elm_config_scale_get(), 48 * 
elm_config_scale_get());
-   evas_object_size_hint_weight_set(logo, 0.1, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(logo, 1.0, EVAS_HINT_FILL);
-   evas_object_show(logo);
-   elm_box_pack_end(hbox, logo);
+   avatar = elm_icon_add(parent);
+   evas_object_size_hint_min_set(avatar, 48 * elm_config_scale_get(), 48 * 
elm_config_scale_get());
+   evas_object_size_hint_weight_set(avatar, 0.1, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(avatar, 1.0, EVAS_HINT_FILL);
+   evas_object_show(avatar);
+   elm_box_pack_end(hbox, avatar);
 
/* General information */
 
@@ -584,23 +583,19 @@ edi_scm_ui_add(Evas_Object *parent)
remote_name = engine->remote_name_get();
remote_email = engine->remote_email_get();
 
-   eina_strbuf_reset(string);
-
+   string = eina_strbuf_new();
if (!remote_name[0] && !remote_email[0])
  {
 eina_strbuf_append(string, _("Unable to obtain user information."));
+
+elm_icon_standard_set(avatar, DEFAULT_USER_ICON);
  }
else
  {
 eina_strbuf_append_printf(string, "%s:%s <%s>", 
_("Author"),
   engine->remote_name_get(), 
engine->remote_email_get());
-avatar = elm_image_add(hbox);
+
 _edi_scm_ui_screens_avatar_load(avatar, engine->remote_email_get());
-evas_object_size_hint_min_set(avatar, 48 * elm_config_scale_get(), 48 
* elm_config_scale_get());
-evas_object_size_hint_weight_set(avatar, 0.1, EVAS_HINT_EXPAND);
-evas_object_size_hint_align_set(avatar, 1.0, EVAS_HINT_FILL);
-evas_object_show(avatar);
-elm_box_pack_end(hbox, avatar);
 
 edi_scm->is_configured = EINA_TRUE;
  }

-- 

[EGIT] [tools/edi] master 01/01: scm: fix avatar caching memory handling

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=15a1529df07ce629b89bf7d44eeb1246ec5cb918

commit 15a1529df07ce629b89bf7d44eeb1246ec5cb918
Author: Andy Williams 
Date:   Tue Oct 3 14:40:10 2017 +0100

scm: fix avatar caching memory handling
---
 src/bin/edi_scm_ui.c | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index e522ec2..7b8bac2 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -50,7 +50,8 @@ void _edi_scm_ui_screens_avatar_download_complete(void *data, 
const char *file,
 static void
 _edi_scm_ui_screens_avatar_load(Evas_Object *image, const char *email)
 {
-   const char *tmp, *cache, *cachedir, *cacheparentdir;
+   char *tmp, *tmp2;
+   const char *cache, *cachedir, *cacheparentdir;
 
cache = _edi_scm_ui_avatar_cache_path_get(email);
if (ecore_file_exists(cache))
@@ -59,9 +60,10 @@ _edi_scm_ui_screens_avatar_load(Evas_Object *image, const 
char *email)
 return;
  }
 
-   tmp = dirname((char *) cache);
-   cachedir = strdup(tmp);
-   cacheparentdir = dirname((char *) tmp);
+   tmp = strdup(cache);
+   cachedir = dirname(tmp);
+   tmp2 = strdup(tmp);
+   cacheparentdir = dirname(tmp2);
if (!ecore_file_exists(cacheparentdir) && !ecore_file_mkdir(cacheparentdir))
  goto clear;
 
@@ -73,7 +75,8 @@ _edi_scm_ui_screens_avatar_load(Evas_Object *image, const 
char *email)
image, NULL);
 
 clear:
-   free((char *)cachedir);
+   free(tmp2);
+   free(tmp);
 }
 
 static void
@@ -233,7 +236,7 @@ _content_get(void *data, Evas_Object *obj, const char 
*source)
mime = efreet_mime_type_get(status->fullpath);
if (mime)
  icon_file = efreet_mime_type_icon_get(mime, elm_config_icon_theme_get(), 
32);
- 
+
if (!icon_file)
  icon_file = "dialog-information";
 
@@ -598,7 +601,7 @@ edi_scm_ui_add(Evas_Object *parent)
 evas_object_size_hint_align_set(avatar, 1.0, EVAS_HINT_FILL);
 evas_object_show(avatar);
 elm_box_pack_end(hbox, avatar);
-   
+
 edi_scm->is_configured = EINA_TRUE;
  }
 
@@ -727,7 +730,7 @@ edi_scm_ui_add(Evas_Object *parent)
evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_horizontal_set(hbox, EINA_TRUE);
evas_object_show(hbox);
-   
+
button = elm_button_add(parent);
evas_object_size_hint_weight_set(button, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(button, EVAS_HINT_FILL, EVAS_HINT_FILL);

-- 

[EGIT] [tools/edi] master 01/02: about: Fix background alpha for changes in EFL

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=eb6d238de6761a7c79fdbc436d8c3a4cd78f5bda

commit eb6d238de6761a7c79fdbc436d8c3a4cd78f5bda
Author: Andy Williams 
Date:   Tue Oct 3 14:23:19 2017 +0100

about: Fix background alpha for changes in EFL
---
 src/bin/screens/edi_about.c | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index 48a4770..ccbf4c9 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -40,22 +40,28 @@ edi_about_show(Evas_Object *mainwin)
elm_win_resize_object_add(win, table);
evas_object_show(table);
 
-   snprintf(buf, sizeof(buf), "%s/images/about.png", elm_app_data_dir_get());
bg = elm_bg_add(win);
-   elm_bg_option_set(bg, ELM_BG_OPTION_CENTER);
-   elm_bg_file_set(bg, buf, NULL);
-   elm_bg_option_set(bg, ELM_BG_OPTION_SCALE);
+   evas_object_color_set(bg, 26, 26, 26, 255);
evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_table_pack(table, bg, 0, 0, 1, 1);
evas_object_show(bg);
 
+   snprintf(buf, sizeof(buf), "%s/images/about.png", elm_app_data_dir_get());
+   bg = elm_image_add(win);
+   elm_image_fill_outside_set(bg, EINA_TRUE);
+   elm_image_file_set(bg, buf, NULL);
+   evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(bg, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_table_pack(table, bg, 0, 0, 1, 1);
+
evas_object_color_get(bg, &r, &g, &b, &alpha);
evas_color_argb_unpremul(alpha, &r, &g, &b);
alpha = 64;
 
evas_color_argb_premul(alpha, &r, &g, &b);
evas_object_color_set(bg, r, g, b, alpha);
+   evas_object_show(bg);
 
vbox = elm_box_add(win);
elm_box_padding_set(vbox, 25, 0);
@@ -84,7 +90,7 @@ edi_about_show(Evas_Object *mainwin)
evas_object_show(text);
 
title = elm_entry_add(box);
-   elm_object_text_set(title, _("EDI's lovely authors"));
+   elm_object_text_set(title, _("EDI's lovely authors"));
elm_entry_editable_set(title, EINA_FALSE);
elm_object_focus_allow_set(title, EINA_FALSE);
evas_object_size_hint_weight_set(title, EVAS_HINT_EXPAND, 0.0);
@@ -147,7 +153,7 @@ edi_about_show(Evas_Object *mainwin)
elm_box_pack_end(buttonbox, button);
evas_object_show(button);
 
-   evas_object_resize(win, 520 * elm_config_scale_get(), 300 * 
elm_config_scale_get());
+   evas_object_resize(win, 520 * elm_config_scale_get(), 360 * 
elm_config_scale_get());
evas_object_show(win);
 
return win;

-- 

[EGIT] [tools/edi] master 02/02: Ignore new binary

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=f89442047a62132e883e8130c5ee54755cce

commit f89442047a62132e883e8130c5ee54755cce
Author: Andy Williams 
Date:   Tue Oct 3 14:23:43 2017 +0100

Ignore new binary
---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index cbbf0c1..35bc462 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 
 /src/bin/edi
 /src/bin/edi_build
+/src/bin/edi_scm
 /data/desktop/edi.desktop
 /data/extra/skeleton/*.tar.gz
 /doc/edi.1

-- 

[EGIT] [tools/edi] master 01/01: Update TODO following release

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=c03a712d83388142a1702b27c86b3078043f0915

commit c03a712d83388142a1702b27c86b3078043f0915
Author: Andy Williams 
Date:   Wed Sep 27 17:39:08 2017 +0100

Update TODO following release
---
 TODO | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TODO b/TODO
index 4596c69..a8cdc32 100644
--- a/TODO
+++ b/TODO
@@ -3,11 +3,11 @@ This project is in heavy development, we are currenty working 
towards the
 
 * Replace text (project-wide)
 * Code folding
-* Split pane view (split editor into multiple tabs and split tab to multiple 
panes)
+* Split pane view (split a tab to multiple views on a file)
 * Automatic code indenting / formatting
+* notepad, emacs and vim and editing modes (key bindings)
 * LLVM parsing
 * Integrated console
-* notepad, emacs and vim and editing modes (key bindings)
 * Cross reference for c, c++ and some scripting language
 * Support for EditorConfig - http://editorconfig.org/
 

-- 

[EGIT] [tools/edi] master 03/04: change list for release

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=e2dd077ba0c86be2d9b7e2e2d3d1f105865968dd

commit e2dd077ba0c86be2d9b7e2e2d3d1f105865968dd
Author: Andy Williams 
Date:   Tue Sep 26 15:28:11 2017 +0100

change list for release
---
 NEWS | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 03dd768..0a60dd7 100644
--- a/NEWS
+++ b/NEWS
@@ -8,12 +8,19 @@ Features:
   * Integrate GDB debugger console
   * Add snippet support to the code editor
   * Add SCM support (git)
+  * Provide tab completion & suggestions for autosuggest and snippets
   * Add rust language and clang build support
   * Highlight all search results
+  * Wrap search around at end of document
+  * Add checkout project to welcome screen
+  * Add translation support
 
 Bug fixes:
 
   * Fix issue where large projects could cause slow starts
+  * Fix T6044 Project templating fails with special characters in projects 
settings
+  * Fix T5480 EDI does not open window on some mime/file types
+  * Fix T1852 Search should wrap around
 
 -
 Edi 0.5.1

-- 

[EGIT] [tools/edi] master 04/04: begin 0.7 devel

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=1daf2362750166e7250025b049c06b5450df0463

commit 1daf2362750166e7250025b049c06b5450df0463
Author: Andy Williams 
Date:   Tue Sep 26 15:40:10 2017 +0100

begin 0.7 devel
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 438c22b..fa72c17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-EFL_VERSION([0], [5], [99])
+EFL_VERSION([0], [6], [99])
 AC_INIT([edi], [efl_version], [enlightenment-devel@lists.sourceforge.net])
 
 AC_PREREQ([2.65])

-- 

[EGIT] [tools/edi] master 02/04: Update translations

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=61004b197789c86edf75c93e0511a350a7509e0e

commit 61004b197789c86edf75c93e0511a350a7509e0e
Author: Andy Williams 
Date:   Tue Sep 26 15:23:41 2017 +0100

Update translations
---
 po/edi.pot | 302 +
 1 file changed, 144 insertions(+), 158 deletions(-)

diff --git a/po/edi.pot b/po/edi.pot
index f3671e2..9287d7a 100644
--- a/po/edi.pot
+++ b/po/edi.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: edi 0.5.99\n"
+"Project-Id-Version: edi 0.6.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-09-11 21:05+0100\n"
+"POT-Creation-Date: 2017-09-26 13:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -27,14 +27,14 @@ msgstr ""
 #: src/bin/mainview/edi_mainview.c:554
 #: src/bin/mainview/edi_mainview_panel.c:700
 #: src/bin/editor/edi_editor_search.c:518
-#: src/bin/screens/edi_file_screens.c:221
-#: src/bin/screens/edi_file_screens.c:282
-#: src/bin/screens/edi_file_screens.c:343 src/bin/screens/edi_scm_screens.c:266
+#: src/bin/screens/edi_file_screens.c:222
+#: src/bin/screens/edi_file_screens.c:283
+#: src/bin/screens/edi_file_screens.c:344 src/bin/screens/edi_scm_screens.c:493
 msgid "Cancel"
 msgstr ""
 
 #: src/bin/mainview/edi_mainview.c:560 src/bin/editor/edi_editor_search.c:502
-#: src/bin/edi_main.c:428
+#: src/bin/edi_main.c:429
 msgid "Search"
 msgstr ""
 
@@ -48,9 +48,9 @@ msgid ""
 "menu options."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:122
-#: src/bin/screens/edi_welcome.c:70 src/bin/screens/edi_file_screens.c:28
-#: src/bin/screens/edi_scm_screens.c:32 src/bin/screens/edi_scm_screens.c:300
+#: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:121
+#: src/bin/screens/edi_welcome.c:70 src/bin/screens/edi_file_screens.c:29
+#: src/bin/screens/edi_scm_screens.c:36 src/bin/screens/edi_scm_screens.c:531
 msgid "OK"
 msgstr ""
 
@@ -74,43 +74,43 @@ msgstr ""
 msgid "See also"
 msgstr ""
 
-#: src/bin/editor/edi_editor_documentation.c:138
+#: src/bin/editor/edi_editor_documentation.c:140
 msgid "No help available for this term"
 msgstr ""
 
-#: src/bin/editor/edi_editor_documentation.c:160 src/bin/edi_main.c:1101
-#: src/bin/edi_main.c:1180
+#: src/bin/editor/edi_editor_documentation.c:162 src/bin/edi_main.c:1120
+#: src/bin/edi_main.c:1199
 msgid "Close"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:73
+#: src/bin/editor/edi_editor.c:75
 msgid "Confirmation"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:88
+#: src/bin/editor/edi_editor.c:94
 msgid ""
 "File contents have changed. Would you like to reload  the contents of "
 "this file?"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:103
+#: src/bin/editor/edi_editor.c:109
 msgid "Reload"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:108
+#: src/bin/editor/edi_editor.c:114
 msgid "No, continue editing"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:676
+#: src/bin/editor/edi_editor.c:869
 #, c-format
 msgid "Line:%d, Column:%d"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:719
+#: src/bin/editor/edi_editor.c:940
 msgid "WIN"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:721
+#: src/bin/editor/edi_editor.c:942
 msgid "UNIX"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgstr ""
 msgid "Confirmation required"
 msgstr ""
 
-#: src/bin/screens/edi_screens.c:73
+#: src/bin/screens/edi_screens.c:72
 msgid "Yes"
 msgstr ""
 
-#: src/bin/screens/edi_screens.c:79
+#: src/bin/screens/edi_screens.c:78
 msgid "No"
 msgstr ""
 
@@ -190,8 +190,8 @@ msgstr ""
 msgid "Creator Email"
 msgstr ""
 
-#: src/bin/screens/edi_welcome.c:439 src/bin/screens/edi_file_screens.c:288
-#: src/bin/screens/edi_file_screens.c:349
+#: src/bin/screens/edi_welcome.c:439 src/bin/screens/edi_file_screens.c:289
+#: src/bin/screens/edi_file_screens.c:350
 msgid "Create"
 msgstr ""
 
@@ -231,63 +231,63 @@ msgstr ""
 msgid "Choose Project"
 msgstr ""
 
-#: src/bin/screens/edi_file_screens.c:61
+#: src/bin/screens/edi_file_screens.c:62
 msgid "Please enter a file name."
 msgstr ""
 
-#: src/bin/screens/edi_file_screens.c:76
+#: src/bin/screens/edi_file_screens.c:77
 msgid "Unable to write file."
 msgstr ""
 
-#: src/bin/screens/edi_file

[EGIT] [tools/edi] master 01/04: Fix make dist

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=a5896c05ac1dd2faa5c4021d3ad1328206b74fb9

commit a5896c05ac1dd2faa5c4021d3ad1328206b74fb9
Author: Andy Williams 
Date:   Tue Sep 26 15:22:38 2017 +0100

Fix make dist
---
 src/bin/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 75ca66b..1c23023 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -66,6 +66,7 @@ edi_private.h
 
 EXTRA_DIST = \
 language/edi_language_provider_c.c \
+language/edi_language_provider_python.c \
 language/edi_language_provider_rust.c
 
 edi_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la $(LTLIBINTL)

-- 

[EGIT] [tools/edi] edi-0.6 01/03: Fix make dist

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=2843b94bf0f8482d42254cf3df823d1f1970a516

commit 2843b94bf0f8482d42254cf3df823d1f1970a516
Author: Andy Williams 
Date:   Tue Sep 26 15:22:38 2017 +0100

Fix make dist
---
 src/bin/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 75ca66b..1c23023 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -66,6 +66,7 @@ edi_private.h
 
 EXTRA_DIST = \
 language/edi_language_provider_c.c \
+language/edi_language_provider_python.c \
 language/edi_language_provider_rust.c
 
 edi_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la $(LTLIBINTL)

-- 

[EGIT] [tools/edi] edi-0.6 02/03: Update translations

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=c1ca2ed0b7d45108b1b3a9c4500655430690a3f2

commit c1ca2ed0b7d45108b1b3a9c4500655430690a3f2
Author: Andy Williams 
Date:   Tue Sep 26 15:23:41 2017 +0100

Update translations
---
 po/edi.pot | 302 +
 1 file changed, 144 insertions(+), 158 deletions(-)

diff --git a/po/edi.pot b/po/edi.pot
index f3671e2..9287d7a 100644
--- a/po/edi.pot
+++ b/po/edi.pot
@@ -5,9 +5,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: edi 0.5.99\n"
+"Project-Id-Version: edi 0.6.0\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2017-09-11 21:05+0100\n"
+"POT-Creation-Date: 2017-09-26 13:49+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -27,14 +27,14 @@ msgstr ""
 #: src/bin/mainview/edi_mainview.c:554
 #: src/bin/mainview/edi_mainview_panel.c:700
 #: src/bin/editor/edi_editor_search.c:518
-#: src/bin/screens/edi_file_screens.c:221
-#: src/bin/screens/edi_file_screens.c:282
-#: src/bin/screens/edi_file_screens.c:343 src/bin/screens/edi_scm_screens.c:266
+#: src/bin/screens/edi_file_screens.c:222
+#: src/bin/screens/edi_file_screens.c:283
+#: src/bin/screens/edi_file_screens.c:344 src/bin/screens/edi_scm_screens.c:493
 msgid "Cancel"
 msgstr ""
 
 #: src/bin/mainview/edi_mainview.c:560 src/bin/editor/edi_editor_search.c:502
-#: src/bin/edi_main.c:428
+#: src/bin/edi_main.c:429
 msgid "Search"
 msgstr ""
 
@@ -48,9 +48,9 @@ msgid ""
 "menu options."
 msgstr ""
 
-#: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:122
-#: src/bin/screens/edi_welcome.c:70 src/bin/screens/edi_file_screens.c:28
-#: src/bin/screens/edi_scm_screens.c:32 src/bin/screens/edi_scm_screens.c:300
+#: src/bin/mainview/edi_mainview_panel.c:447 src/bin/screens/edi_screens.c:121
+#: src/bin/screens/edi_welcome.c:70 src/bin/screens/edi_file_screens.c:29
+#: src/bin/screens/edi_scm_screens.c:36 src/bin/screens/edi_scm_screens.c:531
 msgid "OK"
 msgstr ""
 
@@ -74,43 +74,43 @@ msgstr ""
 msgid "See also"
 msgstr ""
 
-#: src/bin/editor/edi_editor_documentation.c:138
+#: src/bin/editor/edi_editor_documentation.c:140
 msgid "No help available for this term"
 msgstr ""
 
-#: src/bin/editor/edi_editor_documentation.c:160 src/bin/edi_main.c:1101
-#: src/bin/edi_main.c:1180
+#: src/bin/editor/edi_editor_documentation.c:162 src/bin/edi_main.c:1120
+#: src/bin/edi_main.c:1199
 msgid "Close"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:73
+#: src/bin/editor/edi_editor.c:75
 msgid "Confirmation"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:88
+#: src/bin/editor/edi_editor.c:94
 msgid ""
 "File contents have changed. Would you like to reload  the contents of "
 "this file?"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:103
+#: src/bin/editor/edi_editor.c:109
 msgid "Reload"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:108
+#: src/bin/editor/edi_editor.c:114
 msgid "No, continue editing"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:676
+#: src/bin/editor/edi_editor.c:869
 #, c-format
 msgid "Line:%d, Column:%d"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:719
+#: src/bin/editor/edi_editor.c:940
 msgid "WIN"
 msgstr ""
 
-#: src/bin/editor/edi_editor.c:721
+#: src/bin/editor/edi_editor.c:942
 msgid "UNIX"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgstr ""
 msgid "Confirmation required"
 msgstr ""
 
-#: src/bin/screens/edi_screens.c:73
+#: src/bin/screens/edi_screens.c:72
 msgid "Yes"
 msgstr ""
 
-#: src/bin/screens/edi_screens.c:79
+#: src/bin/screens/edi_screens.c:78
 msgid "No"
 msgstr ""
 
@@ -190,8 +190,8 @@ msgstr ""
 msgid "Creator Email"
 msgstr ""
 
-#: src/bin/screens/edi_welcome.c:439 src/bin/screens/edi_file_screens.c:288
-#: src/bin/screens/edi_file_screens.c:349
+#: src/bin/screens/edi_welcome.c:439 src/bin/screens/edi_file_screens.c:289
+#: src/bin/screens/edi_file_screens.c:350
 msgid "Create"
 msgstr ""
 
@@ -231,63 +231,63 @@ msgstr ""
 msgid "Choose Project"
 msgstr ""
 
-#: src/bin/screens/edi_file_screens.c:61
+#: src/bin/screens/edi_file_screens.c:62
 msgid "Please enter a file name."
 msgstr ""
 
-#: src/bin/screens/edi_file_screens.c:76
+#: src/bin/screens/edi_file_screens.c:77
 msgid "Unable to write file."
 msgstr ""
 
-#: src/bin/screens/edi_file

[EGIT] [tools/edi] edi-0.6 03/03: change list for release

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=b9f0e49bb46bb6adb3cf98009a1861695fc7fe11

commit b9f0e49bb46bb6adb3cf98009a1861695fc7fe11
Author: Andy Williams 
Date:   Tue Sep 26 15:28:11 2017 +0100

change list for release
---
 NEWS | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index 03dd768..0a60dd7 100644
--- a/NEWS
+++ b/NEWS
@@ -8,12 +8,19 @@ Features:
   * Integrate GDB debugger console
   * Add snippet support to the code editor
   * Add SCM support (git)
+  * Provide tab completion & suggestions for autosuggest and snippets
   * Add rust language and clang build support
   * Highlight all search results
+  * Wrap search around at end of document
+  * Add checkout project to welcome screen
+  * Add translation support
 
 Bug fixes:
 
   * Fix issue where large projects could cause slow starts
+  * Fix T6044 Project templating fails with special characters in projects 
settings
+  * Fix T5480 EDI does not open window on some mime/file types
+  * Fix T1852 Search should wrap around
 
 -
 Edi 0.5.1

-- 

[EGIT] [tools/edi] edi-0.6 02/04: autosuggest: avoid lingering tab-complete suggestions

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=95de0ba58a90b2661a28917b761eb4bc8308daf4

commit 95de0ba58a90b2661a28917b761eb4bc8308daf4
Author: Andy Williams 
Date:   Sun Sep 24 21:35:15 2017 +0100

autosuggest: avoid lingering tab-complete suggestions

On focus out or mouse downs we invalidate the suggestion
---
 src/bin/editor/edi_editor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index b0ffb0b..8e9004f 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -882,6 +882,7 @@ _edit_file_changed(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info EI
 
editor = (Edi_Editor *)data;
 
+   _suggest_hint_hide(editor);
if (evas_object_visible_get(editor->suggest_bg))
  return;
 
@@ -1227,6 +1228,7 @@ _unfocused_cb(void *data, Evas_Object *obj EINA_UNUSED, 
void *event_info EINA_UN
if (_edi_config->autosave)
  edi_editor_save(editor);
 
+   _suggest_hint_hide(editor);
if (editor->suggest_bg)
  evas_object_hide(editor->suggest_bg);
 
@@ -1248,6 +1250,7 @@ _mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
editor = (Edi_Editor *)data;
event = (Evas_Event_Mouse_Up *)event_info;
 
+   _suggest_hint_hide(editor);
if (editor->suggest_bg)
  evas_object_hide(editor->suggest_bg);
 

-- 

[EGIT] [tools/edi] edi-0.6 01/04: snippet: fix indentation of inserted lines

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=021d1c2da5044b4c6bd53a699e3db54bd52a95f6

commit 021d1c2da5044b4c6bd53a699e3db54bd52a95f6
Author: Andy Williams 
Date:   Sun Sep 24 21:33:45 2017 +0100

snippet: fix indentation of inserted lines
---
 src/bin/editor/edi_editor.c | 30 +++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index e792126..b0ffb0b 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -578,10 +578,14 @@ _suggest_popup_setup(Edi_Editor *editor)
 static void
 _edi_editor_snippet_insert(Edi_Editor *editor)
 {
-   char *key;
-   const char *snippet;
+   char *key, *leading;
+   unsigned int line_len;
+   int nl_pos;
+   short nl_len;
+   const char *snippet, *ptr;
unsigned int row, col;
Edi_Language_Provider *provider;
+   Elm_Code_Line *line;
 
provider = edi_language_provider_get(editor);
elm_code_widget_cursor_position_get(editor->entry, &row, &col);
@@ -591,9 +595,29 @@ _edi_editor_snippet_insert(Edi_Editor *editor)
if (!snippet)
  return;
 
+   line = 
elm_code_file_line_get(elm_code_widget_code_get(editor->entry)->file, row);
+   leading = elm_code_line_indent_get(line);
+
elm_code_widget_selection_select_word(editor->entry, row, col);
elm_code_widget_selection_delete(editor->entry);
-   elm_code_widget_text_at_cursor_insert(editor->entry, snippet);
+
+   ptr = snippet;
+   nl_pos = elm_code_text_newlinenpos(ptr, strlen(ptr), &nl_len);
+
+   while (nl_pos != ELM_CODE_TEXT_NOT_FOUND)
+ {
+char *insert;
+line_len = nl_pos + nl_len;
+
+insert = strndup(ptr, line_len);
+elm_code_widget_text_at_cursor_insert(editor->entry, insert);
+elm_code_widget_text_at_cursor_insert(editor->entry, leading);
+free(insert);
+
+ptr += line_len;
+nl_pos = elm_code_text_newlinenpos(ptr, strlen(ptr), &nl_len);
+ }
+   elm_code_widget_text_at_cursor_insert(editor->entry, ptr);
 
free(key);
return;

-- 

[EGIT] [tools/edi] edi-0.6 03/04: filepanel: fix menu icon for folders

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=b88a90eb3537894be2af243996a3478743ca7787

commit b88a90eb3537894be2af243996a3478743ca7787
Author: Andy Williams 
Date:   Sun Sep 24 21:45:52 2017 +0100

filepanel: fix menu icon for folders
---
 src/bin/edi_filepanel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 565c5aa..7ad0f7c 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -537,7 +537,7 @@ _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);
 
-   menu_it = elm_menu_item_add(menu, NULL, "document-properties", 
basename((char *)sd->path), NULL, NULL);
+   menu_it = elm_menu_item_add(menu, NULL, "folder", basename((char 
*)sd->path), NULL, NULL);
elm_object_item_disabled_set(menu_it, EINA_TRUE);
elm_menu_item_separator_add(menu, NULL);
 

-- 

[EGIT] [tools/edi] edi-0.6 04/04: prep for release

[Andy Williams]

ajwillia-ms pushed a commit to branch edi-0.6.

http://git.enlightenment.org/tools/edi.git/commit/?id=b326fa8cd4c29dfc478490017e579a8cf20bb641

commit b326fa8cd4c29dfc478490017e579a8cf20bb641
Author: Andy Williams 
Date:   Sun Sep 24 21:54:13 2017 +0100

prep for release
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 438c22b..65e8fae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-EFL_VERSION([0], [5], [99])
+EFL_VERSION([0], [6], [0])
 AC_INIT([edi], [efl_version], [enlightenment-devel@lists.sourceforge.net])
 
 AC_PREREQ([2.65])

-- 

[EGIT] [tools/edi] master 01/03: snippet: fix indentation of inserted lines

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=75afcf4be8d1403867c1afaa96b3092fbf02faa2

commit 75afcf4be8d1403867c1afaa96b3092fbf02faa2
Author: Andy Williams 
Date:   Sun Sep 24 21:33:45 2017 +0100

snippet: fix indentation of inserted lines
---
 src/bin/editor/edi_editor.c | 30 +++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index e792126..b0ffb0b 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -578,10 +578,14 @@ _suggest_popup_setup(Edi_Editor *editor)
 static void
 _edi_editor_snippet_insert(Edi_Editor *editor)
 {
-   char *key;
-   const char *snippet;
+   char *key, *leading;
+   unsigned int line_len;
+   int nl_pos;
+   short nl_len;
+   const char *snippet, *ptr;
unsigned int row, col;
Edi_Language_Provider *provider;
+   Elm_Code_Line *line;
 
provider = edi_language_provider_get(editor);
elm_code_widget_cursor_position_get(editor->entry, &row, &col);
@@ -591,9 +595,29 @@ _edi_editor_snippet_insert(Edi_Editor *editor)
if (!snippet)
  return;
 
+   line = 
elm_code_file_line_get(elm_code_widget_code_get(editor->entry)->file, row);
+   leading = elm_code_line_indent_get(line);
+
elm_code_widget_selection_select_word(editor->entry, row, col);
elm_code_widget_selection_delete(editor->entry);
-   elm_code_widget_text_at_cursor_insert(editor->entry, snippet);
+
+   ptr = snippet;
+   nl_pos = elm_code_text_newlinenpos(ptr, strlen(ptr), &nl_len);
+
+   while (nl_pos != ELM_CODE_TEXT_NOT_FOUND)
+ {
+char *insert;
+line_len = nl_pos + nl_len;
+
+insert = strndup(ptr, line_len);
+elm_code_widget_text_at_cursor_insert(editor->entry, insert);
+elm_code_widget_text_at_cursor_insert(editor->entry, leading);
+free(insert);
+
+ptr += line_len;
+nl_pos = elm_code_text_newlinenpos(ptr, strlen(ptr), &nl_len);
+ }
+   elm_code_widget_text_at_cursor_insert(editor->entry, ptr);
 
free(key);
return;

-- 

[EGIT] [tools/edi] master 02/03: autosuggest: avoid lingering tab-complete suggestions

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=2933c2faf62fd8e85025808693920e57bf890b52

commit 2933c2faf62fd8e85025808693920e57bf890b52
Author: Andy Williams 
Date:   Sun Sep 24 21:35:15 2017 +0100

autosuggest: avoid lingering tab-complete suggestions

On focus out or mouse downs we invalidate the suggestion
---
 src/bin/editor/edi_editor.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index b0ffb0b..8e9004f 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -882,6 +882,7 @@ _edit_file_changed(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_info EI
 
editor = (Edi_Editor *)data;
 
+   _suggest_hint_hide(editor);
if (evas_object_visible_get(editor->suggest_bg))
  return;
 
@@ -1227,6 +1228,7 @@ _unfocused_cb(void *data, Evas_Object *obj EINA_UNUSED, 
void *event_info EINA_UN
if (_edi_config->autosave)
  edi_editor_save(editor);
 
+   _suggest_hint_hide(editor);
if (editor->suggest_bg)
  evas_object_hide(editor->suggest_bg);
 
@@ -1248,6 +1250,7 @@ _mouse_up_cb(void *data, Evas *e EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
editor = (Edi_Editor *)data;
event = (Evas_Event_Mouse_Up *)event_info;
 
+   _suggest_hint_hide(editor);
if (editor->suggest_bg)
  evas_object_hide(editor->suggest_bg);
 

-- 

[EGIT] [tools/edi] master 03/03: filepanel: fix menu icon for folders

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=2b2454a104e58ad200bab02f78e294fa2d60613f

commit 2b2454a104e58ad200bab02f78e294fa2d60613f
Author: Andy Williams 
Date:   Sun Sep 24 21:45:52 2017 +0100

filepanel: fix menu icon for folders
---
 src/bin/edi_filepanel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 565c5aa..7ad0f7c 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -537,7 +537,7 @@ _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);
 
-   menu_it = elm_menu_item_add(menu, NULL, "document-properties", 
basename((char *)sd->path), NULL, NULL);
+   menu_it = elm_menu_item_add(menu, NULL, "folder", basename((char 
*)sd->path), NULL, NULL);
elm_object_item_disabled_set(menu_it, EINA_TRUE);
elm_menu_item_separator_add(menu, NULL);
 

-- 

[EGIT] [tools/edi] master 01/01: filepanel: Make the filename in menu informational

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=ef18a26ddc1a00beb1b512abb85f43b14e38ae64

commit ef18a26ddc1a00beb1b512abb85f43b14e38ae64
Author: Andy Williams 
Date:   Fri Sep 22 12:27:40 2017 +0100

filepanel: Make the filename in menu informational
---
 src/bin/edi_filepanel.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 7f78a16..610603d 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -406,7 +406,8 @@ _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, "document-properties", basename((char 
*)sd->path), NULL, NULL);
+   menu_it = elm_menu_item_add(menu, NULL, "document-properties", 
basename((char *)sd->path), NULL, NULL);
+   elm_object_item_disabled_set(menu_it, EINA_TRUE);
elm_menu_item_separator_add(menu, NULL);
 
elm_menu_item_add(menu, NULL, "fileopen", _("Open"), _item_menu_open_cb, 
sd);

-- 

[EGIT] [tools/edi] master 01/01: snippet: add some python snippets

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=ba8dd2becf228f9ca1d55113631a06b6a15a6de2

commit ba8dd2becf228f9ca1d55113631a06b6a15a6de2
Author: Andy Williams 
Date:   Fri Sep 22 11:58:29 2017 +0100

snippet: add some python snippets
---
 src/bin/language/edi_language_provider_python.c | 9 +
 1 file changed, 9 insertions(+)

diff --git a/src/bin/language/edi_language_provider_python.c 
b/src/bin/language/edi_language_provider_python.c
index a66658c..7981c24 100644
--- a/src/bin/language/edi_language_provider_python.c
+++ b/src/bin/language/edi_language_provider_python.c
@@ -37,6 +37,15 @@ _edi_language_python_mime_name(const char *mime)
 const char *
 _edi_language_python_snippet_get(const char *key EINA_UNUSED)
 {
+   if (!strcmp(key, "def"))
+ return
+"def ():\n" \
+"";
+   else if (!strcmp(key, "defi"))
+ return
+"def __init__(self):\n" \
+"";
+
return NULL;
 }
 

-- 

[EGIT] [tools/edi] master 01/01: autosuggest: Add safety for optional language features

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=f1643f08ef35e6ef279aa5791a31a797cbbea19b

commit f1643f08ef35e6ef279aa5791a31a797cbbea19b
Author: Andy Williams 
Date:   Fri Sep 22 10:28:50 2017 +0100

autosuggest: Add safety for optional language features

@fix crash with rust editor
---
 src/bin/editor/edi_editor.c   | 2 +-
 src/bin/editor/edi_editor_documentation.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 8484fd5..e792126 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -316,7 +316,7 @@ _suggest_list_load(Edi_Editor *editor)
  return;
 
provider = edi_language_provider_get(editor);
-   if (!provider)
+   if (!provider || !provider->lookup)
  return;
 
if (editor->suggest_list)
diff --git a/src/bin/editor/edi_editor_documentation.c 
b/src/bin/editor/edi_editor_documentation.c
index e307112..c17a759 100644
--- a/src/bin/editor/edi_editor_documentation.c
+++ b/src/bin/editor/edi_editor_documentation.c
@@ -106,6 +106,7 @@ void
 edi_editor_doc_open(Edi_Editor *editor)
 {
Edi_Language_Document *doc = NULL;
+   Edi_Language_Provider *provider;
Evas_Object *label;
const char *detail, *param, *ret, *see;
char *display;
@@ -114,7 +115,8 @@ edi_editor_doc_open(Edi_Editor *editor)
const char *font;
int font_size;
 
-   if (edi_language_provider_has(editor))
+   provider = edi_language_provider_get(editor);
+   if (provider && provider->lookup_doc)
  {
 unsigned int row, col;
 

-- 

[EGIT] [tools/edi] master 01/01: about: fix layout of AUTHORS content in about

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=eed2ae8328693ccdd2ab4b88872b59ef5ba4309b

commit eed2ae8328693ccdd2ab4b88872b59ef5ba4309b
Author: Andy Williams 
Date:   Thu Sep 21 22:15:37 2017 +0100

about: fix layout of AUTHORS content in about
---
 src/bin/screens/edi_about.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index 9e28dfc..48a4770 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -94,12 +94,13 @@ edi_about_show(Evas_Object *mainwin)
 
/* Authors screen */
authors = elm_entry_add(box);
+   elm_entry_line_wrap_set(authors, EINA_FALSE);
+   elm_entry_text_style_user_push(authors, "DEFAULT='font=Mono')");
elm_entry_file_set(authors, PACKAGE_DOC_DIR "/AUTHORS", 
ELM_TEXT_FORMAT_PLAIN_UTF8);
elm_entry_editable_set(authors, EINA_FALSE);
elm_object_focus_allow_set(authors, EINA_FALSE);
evas_object_size_hint_weight_set(authors, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(authors, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_resize(authors, 320 * elm_config_scale_get(), 160 * 
elm_config_scale_get());
elm_box_pack_end(box, authors);
evas_object_show(authors);
 
@@ -146,7 +147,7 @@ edi_about_show(Evas_Object *mainwin)
elm_box_pack_end(buttonbox, button);
evas_object_show(button);
 
-   evas_object_resize(win, 360 * elm_config_scale_get(), 220 * 
elm_config_scale_get());
+   evas_object_resize(win, 520 * elm_config_scale_get(), 300 * 
elm_config_scale_get());
evas_object_show(win);
 
return win;

-- 

[EGIT] [tools/edi] master 02/02: create: Escape single quotes in project and user name

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=1c14989ccda81ed8311dbfc4bb04b801a0dbdaec

commit 1c14989ccda81ed8311dbfc4bb04b801a0dbdaec
Author: Andy Williams 
Date:   Thu Sep 21 20:26:56 2017 +0100

create: Escape single quotes in project and user name

@fix T6044
---
 src/lib/edi_create.c| 42 +-
 src/lib/edi_private.h   |  1 +
 src/tests/Makefile.am   |  1 +
 src/tests/edi_suite.c   |  1 +
 src/tests/edi_suite.h   |  1 +
 src/tests/edi_test_create.c | 38 ++
 6 files changed, 79 insertions(+), 5 deletions(-)

diff --git a/src/lib/edi_create.c b/src/lib/edi_create.c
index 0abfa75..a293a8f 100644
--- a/src/lib/edi_create.c
+++ b/src/lib/edi_create.c
@@ -73,29 +73,61 @@ _edi_create_year_get()
return tp->tm_year + 1900;
 }
 
+char *
+edi_create_escape_quotes(const char *in)
+{
+   char buf[1024], *out_ptr;
+   const char *pos, *in_ptr;
+   int replace_len;
+
+   pos = strstr(in, "'");
+   if (!pos)
+ return strdup(in);
+
+   in_ptr = in;
+   out_ptr = buf;
+   while (pos)
+ {
+replace_len = pos - in_ptr;
+snprintf(out_ptr, replace_len + 1, "%s", in_ptr);
+snprintf(out_ptr + replace_len, 8, "'\\\"'\\\"'");
+
+   in_ptr += replace_len + 1;
+   out_ptr += replace_len + 7;
+pos = strstr(in_ptr, "'");
+ }
+   snprintf(out_ptr, strlen(in) - (in_ptr - in) + 1, "%s", in_ptr);
+
+   return strdup(buf);
+}
+
 static void
 _edi_create_filter_file(Edi_Create *create, const char *path)
 {
-   char *cmd, *lowername, *uppername;
+   char *cmd, *name, *lowername, *uppername, *user;
const char *template;
int length;
 
+   name = edi_create_escape_quotes(create->name);
+   user = edi_create_escape_quotes(create->user);
create->filters++;
 // TODO speed this up - pre-cache this filter!
template = "sh -c \"sed -i.bak 
's|\\${edi_name}|%s|g;s|\\${Edi_Name}|%s|g;s|\\${EDI_NAME}|%s|g;s|\\${Edi_User}|%s|g;s|\\${Edi_Email}|%s|g;s|\\${Edi_Url}|%s|g;s|\\${Edi_Year}|%d|g'
 %s\"; rm %s.bak";
-   length = strlen(template) + (strlen(create->name) * 3)  + 
strlen(create->user) + strlen(create->email) + strlen(create->url) + 
(strlen(path) * 2) + 4 - 16 + 1;
+   length = strlen(template) + (strlen(name) * 3)  + strlen(user) + 
strlen(create->email) + strlen(create->url) + (strlen(path) * 2) + 4 - 16 + 1;
 
-   lowername = strdup(create->name);
+   lowername = strdup(name);
eina_str_tolower(&lowername);
-   uppername = strdup(create->name);
+   uppername = strdup(name);
eina_str_toupper(&uppername);
 
cmd = malloc(sizeof(char) * length);
-   snprintf(cmd, length, template, lowername, create->name, uppername , 
create->user, create->email, create->url, _edi_create_year_get(), path, path);
+   snprintf(cmd, length, template, lowername, name, uppername , user, 
create->email, create->url, _edi_create_year_get(), path, path);
 
ecore_exe_run(cmd, NULL);
free(lowername);
free(uppername);
+   free(name);
+   free(user);
free(cmd);
 
// This matches the filtered path copy created in the copy callback
diff --git a/src/lib/edi_private.h b/src/lib/edi_private.h
index a7824ed..ac3bd48 100644
--- a/src/lib/edi_private.h
+++ b/src/lib/edi_private.h
@@ -2,6 +2,7 @@
 # define EDI_PRIVATE_H
 
 extern int _edi_lib_log_dom;
+char *edi_create_escape_quotes(const char *in);
 
 #ifdef ERR
 # undef ERR
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 23aefb8..2ff571b 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -9,6 +9,7 @@ clang_include = '$(CLANG_INCLUDE)'
 
 edi_suite_SOURCES = \
 edi_test_path.c \
+edi_test_create.c \
 edi_test_exe.c \
 edi_test_content_provider.c \
 edi_test_language_provider.c \
diff --git a/src/tests/edi_suite.c b/src/tests/edi_suite.c
index 118f590..b0f1087 100644
--- a/src/tests/edi_suite.c
+++ b/src/tests/edi_suite.c
@@ -15,6 +15,7 @@ static const struct {
 } tests[] = {
   { "basic", edi_test_basic },
   { "path", edi_test_path },
+  { "create", edi_test_create },
   { "exe", edi_test_exe },
   { "content_provider", edi_test_content_provider },
   { "language_provider", edi_test_language_provider },
diff --git a/src/tests/edi_suite.h b/src/tests/edi_suite.h
index 3b235d7..d8d3e69 100644
--- a/src/tests/edi_suite.h
+++ b/src/tests/edi_suite.h
@@ -8,6 +8,7 @@
 void edi_test_basic(TCase *tc);
 void edi_test_console(TCase *tc);
 void edi_test_path(TCase *tc);
+void edi_test_create(TCase *tc);
 void edi_test_exe(TCase *tc);
 void edi_test_content_provider(TCase *tc);
 void edi_test_language_provider(TCase *tc);
diff --git a/src/tests/edi_test_create.c b/src/tests/edi_test_create.c
new file mo

[EGIT] [tools/edi] master 01/02: disable broken tests - need to move from including C code!!!

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=efb4793a101525f7c471f41cc0d09b284d28b588

commit efb4793a101525f7c471f41cc0d09b284d28b588
Author: Andy Williams 
Date:   Thu Sep 21 15:17:03 2017 +0100

disable broken tests - need to move from including C code!!!
---
 src/tests/edi_test_content_provider.c| 1 +
 src/tests/edi_test_language_provider.c   | 8 +++-
 src/tests/edi_test_language_provider_c.c | 5 ++---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/tests/edi_test_content_provider.c 
b/src/tests/edi_test_content_provider.c
index d2610d2..7d3afe6 100644
--- a/src/tests/edi_test_content_provider.c
+++ b/src/tests/edi_test_content_provider.c
@@ -3,6 +3,7 @@
 #endif
 
 #include "edi_content_provider.c"
+#include "language/edi_language_provider.c"
 
 #include "edi_suite.h"
 
diff --git a/src/tests/edi_test_language_provider.c 
b/src/tests/edi_test_language_provider.c
index d2972ab..3ff1d57 100644
--- a/src/tests/edi_test_language_provider.c
+++ b/src/tests/edi_test_language_provider.c
@@ -2,10 +2,8 @@
 # include "config.h"
 #endif
 
-#include "language/edi_language_provider.c"
-
 #include "edi_suite.h"
-
+/*
 START_TEST (edi_test_language_provider_lookup)
 {
Edi_Editor editor;
@@ -18,9 +16,9 @@ START_TEST (edi_test_language_provider_lookup)
ck_assert_str_eq(provider->id, "c");
 }
 END_TEST
-
+*/
 void edi_test_language_provider(TCase *tc)
 {
-   tcase_add_test(tc, edi_test_language_provider_lookup);
+//   tcase_add_test(tc, edi_test_language_provider_lookup);
 }
 
diff --git a/src/tests/edi_test_language_provider_c.c 
b/src/tests/edi_test_language_provider_c.c
index 871d323..a47c805 100644
--- a/src/tests/edi_test_language_provider_c.c
+++ b/src/tests/edi_test_language_provider_c.c
@@ -4,13 +4,11 @@
 
 #include 
 
-#include "../bin/edi_private.h"
-#include "language/edi_language_provider.h"
-
 #include "edi_suite.h"
 
 int _edi_lib_log_dom = -1;
 
+/*
 static Elm_Code *
 _setup(Edi_Editor *editor, Evas_Object *win)
 {
@@ -99,6 +97,7 @@ START_TEST (edi_test_language_provider_c_summary)
elm_shutdown();
 }
 END_TEST
+*/
 
 void edi_test_language_provider_c(TCase *tc)
 {

-- 

[EGIT] [core/efl] efl-1.20 01/01: elm_code: respect event hold for key_down

[Andy Williams]

ajwillia-ms pushed a commit to branch efl-1.20.

http://git.enlightenment.org/core/efl.git/commit/?id=8699629324fff5793646e86cd5e20f798fe6040f

commit 8699629324fff5793646e86cd5e20f798fe6040f
Author: Andy Williams 
Date:   Thu Sep 21 12:24:51 2017 +0100

elm_code: respect event hold for key_down
---
 src/lib/elementary/elm_code_widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 2529321cac..185a9a435a 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1600,7 +1600,7 @@ _elm_code_widget_key_down_cb(void *data, Evas *evas 
EINA_UNUSED,
 
Evas_Event_Key_Down *ev = event_info;
 
-   if (!pd->editable)
+   if (!pd->editable || (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
  return;
 
_elm_code_widget_update_focus_directions(widget);

-- 

[EGIT] [tools/edi] master 01/01: autosuggest: veto tab propagation for all inserts

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=add0d7f6c470f7dee4f6d7a090f6e31c9920e6ec

commit add0d7f6c470f7dee4f6d7a090f6e31c9920e6ec
Author: Andy Williams 
Date:   Thu Sep 21 12:29:57 2017 +0100

autosuggest: veto tab propagation for all inserts
---
 src/bin/editor/edi_editor.c | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index b5abe06..8484fd5 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -576,7 +576,7 @@ _suggest_popup_setup(Edi_Editor *editor)
 }
 
 static void
-_edi_editor_snippet_insert(Edi_Editor *editor, Evas_Event_Key_Down *ev)
+_edi_editor_snippet_insert(Edi_Editor *editor)
 {
char *key;
const char *snippet;
@@ -595,8 +595,6 @@ _edi_editor_snippet_insert(Edi_Editor *editor, 
Evas_Event_Key_Down *ev)
elm_code_widget_selection_delete(editor->entry);
elm_code_widget_text_at_cursor_insert(editor->entry, snippet);
 
-   if (ev)
- ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
free(key);
return;
 }
@@ -656,7 +654,7 @@ _suggest_hint_click_snippet(void *data, Evas_Object *obj 
EINA_UNUSED,
Edi_Editor *editor = data;
 
_suggest_hint_hide(editor);
-   _edi_editor_snippet_insert(editor, NULL);
+   _edi_editor_snippet_insert(editor);
 }
 
 static void
@@ -815,12 +813,18 @@ _smart_cb_key_down(void *data EINA_UNUSED, Evas *e 
EINA_UNUSED,
 snippet = provider->snippet_get(word);
 
 if (snippet)
-  _edi_editor_snippet_insert(editor, ev);
+  {
+ ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+ _edi_editor_snippet_insert(editor);
+  }
 else if (strlen(word) >= 3)
   {
  suggest = _suggest_match_get(editor, word);
  if (suggest)
-   _suggest_list_selection_insert(editor, suggest->summary);
+   {
+  ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+  _suggest_list_selection_insert(editor, suggest->summary);
+   }
   }
 
 free(word);

-- 

[EGIT] [core/efl] master 01/01: elm_code: respect event hold for key_down

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ad6a858aad15048dd4448dba011d4c15de297d7d

commit ad6a858aad15048dd4448dba011d4c15de297d7d
Author: Andy Williams 
Date:   Thu Sep 21 12:24:51 2017 +0100

elm_code: respect event hold for key_down
---
 src/lib/elementary/elm_code_widget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 0128d7a453..c6493f4cd7 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1600,7 +1600,7 @@ _elm_code_widget_key_down_cb(void *data, Evas *evas 
EINA_UNUSED,
 
Evas_Event_Key_Down *ev = event_info;
 
-   if (!pd->editable)
+   if (!pd->editable || (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD))
  return;
 
_elm_code_widget_update_focus_directions(widget);

-- 

[EGIT] [tools/edi] master 01/02: autosuggest: Show first match for tab completion

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=e03f234573172f353a7fad9beef7805fc5b39d1a

commit e03f234573172f353a7fad9beef7805fc5b39d1a
Author: Andy Williams 
Date:   Wed Sep 20 19:02:50 2017 +0100

autosuggest: Show first match for tab completion

Displays a hover that shows the match - and you can click it too.

Closes T5902
@feature
---
 src/bin/editor/edi_editor.c | 218 ++--
 1 file changed, 210 insertions(+), 8 deletions(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index b9caa2a..9ca6bfd 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -17,6 +17,8 @@
 
 #include "edi_private.h"
 
+static Evas_Object *_suggest_hint;
+
 static void _suggest_popup_show(Edi_Editor *editor);
 
 typedef struct
@@ -598,8 +600,147 @@ _edi_editor_snippet_insert(Edi_Editor *editor, 
Evas_Event_Key_Down *ev)
elm_code_widget_selection_delete(editor->entry);
elm_code_widget_text_at_cursor_insert(editor->entry, snippet);
 
-   ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
+   if (ev)
+ ev->event_flags |= EVAS_EVENT_FLAG_ON_HOLD;
free(key);
+   return;
+}
+
+static void
+_suggest_hint_hide(Edi_Editor *editor EINA_UNUSED)
+{
+   if (!_suggest_hint)
+ return;
+
+   evas_object_hide(_suggest_hint);
+}
+
+static Evas_Object *
+_suggest_hint_popup_add(Edi_Editor *editor, const char *content, Evas_Smart_Cb 
fn)
+{
+   Evas_Object *pop, *btn, *text;
+   unsigned int row, col;
+   Evas_Coord cx, cy, cw, ch;
+
+   elm_code_widget_cursor_position_get(editor->entry, &row, &col);
+
+   elm_code_widget_cursor_position_get(editor->entry, &row, &col);
+   elm_code_widget_geometry_for_position_get(editor->entry, row, col,
+ &cx, &cy, &cw, &ch);
+
+   pop = elm_box_add(editor->entry);
+   evas_object_size_hint_weight_set(pop, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(pop, EVAS_HINT_FILL, EVAS_HINT_FILL);
+
+   evas_object_size_hint_weight_set(pop, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(pop, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   evas_object_move(pop, cx, cy - ch);
+
+   btn = elm_button_add(pop);
+   evas_object_smart_callback_add(btn, "clicked", fn, editor);
+   evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_box_pack_end(pop, btn);
+   evas_object_show(btn);
+
+   text = elm_label_add(btn);
+   evas_object_size_hint_weight_set(text, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+   evas_object_size_hint_align_set(text, EVAS_HINT_FILL, EVAS_HINT_FILL);
+   elm_object_text_set(text, content);
+
+   elm_layout_content_set(btn, "elm.swallow.content", text);
+   evas_object_show(text);
+
+   return pop;
+}
+
+static void
+_suggest_hint_click_snippet(void *data, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+   Edi_Editor *editor = data;
+
+   _suggest_hint_hide(editor);
+   _edi_editor_snippet_insert(editor, NULL);
+}
+
+static void
+_suggest_hint_show_snippet(Edi_Editor *editor, const char *word)
+{
+   unsigned int row, col;
+   const char *snippet;
+
+   if (!word || strlen(word) == 0)
+ return;
+
+   elm_code_widget_cursor_position_get(editor->entry, &row, &col);
+
+   snippet = edi_language_provider_get(editor)->snippet_get(word);
+   if (!snippet)
+ return;
+
+   _suggest_hint = _suggest_hint_popup_add(editor,
+  eina_slstr_printf("Press tab to insert snippet %s", 
word),
+  _suggest_hint_click_snippet);
+   evas_object_show(_suggest_hint);
+}
+
+Edi_Language_Suggest_Item *
+_suggest_match_get(Edi_Editor *editor, const char *word)
+{
+   Edi_Language_Suggest_Item *suggest_it;
+   unsigned int row, col, wordlen;
+
+   elm_code_widget_cursor_position_get(editor->entry, &row, &col);
+   Eina_List *l, *list = edi_language_provider_get(editor)->lookup(editor, 
row, col - strlen(word));
+
+   wordlen = strlen(word);
+   EINA_LIST_FOREACH(list, l, suggest_it)
+ {
+if (strlen(suggest_it->summary) <= wordlen)
+  continue;
+if (eina_str_has_prefix(suggest_it->summary, word))
+  return suggest_it;
+ }
+
+   return NULL;
+}
+
+static void
+_suggest_hint_click_suggest(void *data, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+   Edi_Editor *editor = data;
+   Edi_Language_Suggest_Item *match;
+   unsigned int row, col;
+   char *word;
+
+   _suggest_hint_hide(editor);
+
+   elm_code_widget_cursor_position_get(editor->entry, &row, &col);
+   word = _edi_editor_current_word_get(editor, row, col);
+
+   match = _suggest_match_get(editor, word);
+   if (match)
+ _suggest_l

[EGIT] [tools/edi] master 02/02: autosuggest: speed up suggeestions

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=02525fe8adc25e034aec8a2a73c954e0edbf0534

commit 02525fe8adc25e034aec8a2a73c954e0edbf0534
Author: Andy Williams 
Date:   Wed Sep 20 22:11:05 2017 +0100

autosuggest: speed up suggeestions

cache the list and refresh when we re-parse...
---
 src/bin/editor/edi_editor.c | 105 
 src/bin/editor/edi_editor.h |   1 +
 2 files changed, 48 insertions(+), 58 deletions(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 9ca6bfd..b5abe06 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -177,7 +177,7 @@ _changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void 
*event_info EINA_UNUS
 }
 
 static char *
-_edi_editor_current_word_get(Edi_Editor *editor, unsigned int row, unsigned 
int col)
+_edi_editor_word_at_position_get(Edi_Editor *editor, unsigned int row, 
unsigned int col)
 {
Elm_Code *code;
Elm_Code_Line *line;
@@ -208,6 +208,16 @@ _edi_editor_current_word_get(Edi_Editor *editor, unsigned 
int row, unsigned int
return curword;
 }
 
+static char *
+_edi_editor_current_word_get(Edi_Editor *editor)
+{
+   unsigned int row, col;
+
+   elm_code_widget_cursor_position_get(editor->entry, &row, &col);
+
+   return _edi_editor_word_at_position_get(editor, row, col);
+}
+
 static Evas_Object *
 _suggest_list_content_get(void *data, Evas_Object *obj, const char *part)
 {
@@ -259,19 +269,17 @@ static void
 _suggest_list_update(Edi_Editor *editor, char *word)
 {
Edi_Language_Suggest_Item *suggest_it;
-   Eina_List *list, *l;
+   Eina_List *l;
Elm_Genlist_Item_Class *ic;
Elm_Object_Item *item;
 
elm_genlist_clear(editor->suggest_genlist);
 
-   list = (Eina_List *)evas_object_data_get(editor->suggest_genlist,
-"suggest_list");
ic = elm_genlist_item_class_new();
ic->item_style = "full";
ic->func.content_get = _suggest_list_content_get;
 
-   EINA_LIST_FOREACH(list, l, suggest_it)
+   EINA_LIST_FOREACH(editor->suggest_list, l, suggest_it)
  {
 if (eina_str_has_prefix(suggest_it->summary, word))
   {
@@ -298,32 +306,33 @@ _suggest_list_update(Edi_Editor *editor, char *word)
 }
 
 static void
-_suggest_list_set(Edi_Editor *editor)
+_suggest_list_load(Edi_Editor *editor)
 {
+   Edi_Language_Provider *provider;
char *curword;
unsigned int row, col;
-   Eina_List *list = NULL;
 
-   list = (Eina_List *)evas_object_data_get(editor->suggest_genlist,
-"suggest_list");
-   if (list)
+   if (evas_object_visible_get(editor->suggest_bg))
+ return;
+
+   provider = edi_language_provider_get(editor);
+   if (!provider)
+ return;
+
+   if (editor->suggest_list)
  {
 Edi_Language_Suggest_Item *suggest_it;
 
-EINA_LIST_FREE(list, suggest_it)
+EINA_LIST_FREE(editor->suggest_list, suggest_it)
   edi_language_suggest_item_free(suggest_it);
 
-list = NULL;
-evas_object_data_del(editor->suggest_genlist, "suggest_list");
+editor->suggest_list = NULL;
  }
 
elm_code_widget_cursor_position_get(editor->entry, &row, &col);
 
-   curword = _edi_editor_current_word_get(editor, row, col);
-   list = edi_language_provider_get(editor)->lookup(editor, row, col - 
strlen(curword));
-
-   evas_object_data_set(editor->suggest_genlist, "suggest_list", list);
-   _suggest_list_update(editor, curword);
+   curword = _edi_editor_word_at_position_get(editor, row, col);
+   editor->suggest_list = provider->lookup(editor, row, col - strlen(curword));
free(curword);
 }
 
@@ -335,7 +344,7 @@ _suggest_list_selection_insert(Edi_Editor *editor, const 
char *selection)
 
elm_code_widget_cursor_position_get(editor->entry, &row, &col);
 
-   word = _edi_editor_current_word_get(editor, row, col);
+   word = _edi_editor_word_at_position_get(editor, row, col);
wordlen = strlen(word);
free(word);
 
@@ -348,22 +357,8 @@ static void
 _suggest_bg_cb_hide(void *data, Evas *e EINA_UNUSED,
 Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
 {
-   Eina_List *list = NULL;
-   Edi_Editor *editor;
-
-   editor = (Edi_Editor *)data;
-   list = (Eina_List *)evas_object_data_get(editor->suggest_genlist,
-"suggest_list");
-   if (list)
- {
-Edi_Language_Suggest_Item *suggest_it;
-
-EINA_LIST_FREE(list, suggest_it)
-  edi_language_suggest_item_free(suggest_it);
+   Edi_Editor *editor = (Edi_Editor *)data;
 
-list = NULL;
-evas_object_data_del(editor->suggest_genlist, "suggest_list");
- }
evas_object_key_ungrab(editor->suggest_genlist, "

[EGIT] [tools/edi] master 01/01: Add translation support

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=08547bbd3aa8c74c7364581fe890b18786fcdb4b

commit 08547bbd3aa8c74c7364581fe890b18786fcdb4b
Author: Andy Williams 
Date:   Mon Sep 11 21:06:22 2017 +0100

Add translation support

Fixes T5901
---
 Makefile.am |   4 +
 configure.ac|  13 +
 po/POTFILES.in  |  27 +-
 po/edi.pot  | 830 
 src/bin/edi_build_main.c|  18 +-
 src/bin/edi_consolepanel.c  |   2 +-
 src/bin/edi_debugpanel.c|  12 +-
 src/bin/edi_filepanel.c |  40 +-
 src/bin/edi_main.c  | 166 +++--
 src/bin/edi_private.h   |  11 +
 src/bin/editor/edi_editor.c |  14 +-
 src/bin/editor/edi_editor_documentation.c   |  10 +-
 src/bin/editor/edi_editor_search.c  |  14 +-
 src/bin/language/edi_language_provider_c.c  |   4 +-
 src/bin/language/edi_language_provider_python.c |   2 +-
 src/bin/language/edi_language_provider_rust.c   |   2 +-
 src/bin/mainview/edi_mainview.c |   8 +-
 src/bin/mainview/edi_mainview_panel.c   |  12 +-
 src/bin/screens/edi_about.c |  14 +-
 src/bin/screens/edi_file_screens.c  |  44 +-
 src/bin/screens/edi_scm_screens.c   |  40 +-
 src/bin/screens/edi_screens.c   |   8 +-
 src/bin/screens/edi_settings.c  |  50 +-
 src/bin/screens/edi_welcome.c   |  54 +-
 24 files changed, 1137 insertions(+), 262 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ced212e..f38f2f4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,10 @@ EXTRA_DIST = \
m4/efl_compiler_flag.m4 \
m4/efl_path_max.m4
 
+if HAVE_PO
+SUBDIRS += po
+endif
+
 if EFL_HAVE_LCOV
 
 lcov-reset:
diff --git a/configure.ac b/configure.ac
index 858ac91..438c22b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,19 @@ EFL_INIT
 
 AM_GNU_GETTEXT_VERSION([0.17])
 AM_GNU_GETTEXT([external])
+po_makefile_in=po/Makefile.in
+have_po="yes"
+
+AC_SUBST([LTLIBINTL])
+if test "x$LIBINTL" = "x"; then
+  LIBINTL="$INTLLIBS"
+fi
+
+if test "x${POSUB}" = "x" ; then
+  have_po="no"
+fi
+
+AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
 
 # if cross compiling, disable NLS support.
 # It's not worth the trouble, at least for now.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index a25939e..d3b6fa9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,2 +1,27 @@
+src/bin/mainview/edi_mainview.c
+src/bin/mainview/edi_mainview_panel.c
+src/bin/mainview/edi_mainview_item.c
+src/bin/edi_content_provider.c
+src/bin/editor/edi_editor_documentation.c
+src/bin/editor/edi_editor.c
+src/bin/editor/edi_editor_search.c
+src/bin/screens/edi_screens.c
+src/bin/screens/edi_welcome.c
+src/bin/screens/edi_file_screens.c
+src/bin/screens/edi_settings.c
+src/bin/screens/edi_about.c
+src/bin/screens/edi_settings_font.c
+src/bin/screens/edi_scm_screens.c
+src/bin/edi_debugpanel.c
+src/bin/language/edi_language_provider_c.c
+src/bin/language/edi_language_provider_python.c
+src/bin/language/edi_language_provider_rust.c
+src/bin/language/edi_language_provider.c
+src/bin/edi_filepanel.c
+src/bin/edi_build_main.c
+src/bin/edi_file.c
 src/bin/edi_main.c
-src/bin/edi_private.h
+src/bin/edi_logpanel.c
+src/bin/edi_searchpanel.c
+src/bin/edi_config.c
+src/bin/edi_consolepanel.c
diff --git a/po/edi.pot b/po/edi.pot
new file mode 100644
index 000..f3671e2
--- /dev/null
+++ b/po/edi.pot
@@ -0,0 +1,830 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: edi 0.5.99\n"
+"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2017-09-11 21:05+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/bin/mainview/edi_mainview.c:517
+msgid "Search for (whole project)"
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:526
+msgid "Please enter a term to search for within the whole project."
+msgstr ""
+
+#: src/bin/mainview/edi_mainview.c:554
+#: src/bin/mainview/edi_mainview_panel.c:700
+#: src/bin/editor/edi_editor_search.c:518
+#: src/bin/screens/edi_file_screens.c:221
+#: src/bin/screens/edi_file_screens.c:282
+#: src/bin/screens/edi_file_screens.c:343

[EGIT] [tools/edi] master 01/01: syntax: Fix python syntax by adding a basic provider

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=7bb4a7cc24c5d7d06188089dfa42fa8609ee6939

commit 7bb4a7cc24c5d7d06188089dfa42fa8609ee6939
Author: Andy Williams 
Date:   Thu Sep 7 21:00:31 2017 +0100

syntax: Fix python syntax by adding a basic provider
---
 src/bin/language/edi_language_provider.c|  8 +
 src/bin/language/edi_language_provider_python.c | 42 +
 2 files changed, 50 insertions(+)

diff --git a/src/bin/language/edi_language_provider.c 
b/src/bin/language/edi_language_provider.c
index bd5ca7f..b16585a 100644
--- a/src/bin/language/edi_language_provider.c
+++ b/src/bin/language/edi_language_provider.c
@@ -9,6 +9,7 @@
 #include "edi_private.h"
 
 #include "edi_language_provider_c.c"
+#include "edi_language_provider_python.c"
 #include "edi_language_provider_rust.c"
 
 static Edi_Language_Provider _edi_language_provider_registry[] =
@@ -19,6 +20,11 @@ static Edi_Language_Provider 
_edi_language_provider_registry[] =
   _edi_language_c_lookup, _edi_language_c_lookup_doc
},
{
+  "python", _edi_language_python_add, _edi_language_python_refresh, 
_edi_language_python_del,
+  _edi_language_python_mime_name, _edi_language_python_snippet_get,
+  NULL, NULL
+   },
+   {
   "rust", _edi_language_rust_add, _edi_language_rust_refresh, 
_edi_language_rust_del,
   _edi_language_rust_mime_name, _edi_language_rust_snippet_get,
   NULL, NULL
@@ -47,6 +53,8 @@ Edi_Language_Provider 
*edi_language_provider_for_mime_get(const char *mime)
  id = "c";
if (!strcasecmp(mime, "text/rust"))
  id = "rust";
+   if (!strcasecmp(mime, "text/x-python"))
+ id = "python";
 
if (!id)
  return NULL;
diff --git a/src/bin/language/edi_language_provider_python.c 
b/src/bin/language/edi_language_provider_python.c
new file mode 100644
index 000..551780f
--- /dev/null
+++ b/src/bin/language/edi_language_provider_python.c
@@ -0,0 +1,42 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include 
+
+#include "edi_language_provider.h"
+
+#include "edi_config.h"
+
+#include "edi_private.h"
+
+void
+_edi_language_python_add(Edi_Editor *editor EINA_UNUSED)
+{
+}
+
+void
+_edi_language_python_refresh(Edi_Editor *editor EINA_UNUSED)
+{
+}
+
+void
+_edi_language_python_del(Edi_Editor *editor EINA_UNUSED)
+{
+}
+
+const char *
+_edi_language_python_mime_name(const char *mime)
+{
+   if (!strcasecmp(mime, "text/x-python"))
+ return "Python source";
+
+   return NULL;
+}
+
+const char *
+_edi_language_python_snippet_get(const char *key EINA_UNUSED)
+{
+   return NULL;
+}
+

-- 

[EGIT] [tools/edi] master 01/01: Fix possible crashes in windowed editor

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=a004aeae6b2b4f482029b6092bdfae8d58116cd5

commit a004aeae6b2b4f482029b6092bdfae8d58116cd5
Author: Andy Williams 
Date:   Mon Aug 21 17:26:26 2017 +0100

Fix possible crashes in windowed editor
---
 src/bin/mainview/edi_mainview_panel.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index 3efccc6..47446f6 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -454,7 +454,7 @@ edi_mainview_panel_can_undo(Edi_Mainview_Panel *panel)
 {
Edi_Editor *editor;
 
-   if (!panel->current)
+   if (!panel || !panel->current)
  return EINA_FALSE;
 
editor = (Edi_Editor *)evas_object_data_get(panel->current->view, "editor");
@@ -481,7 +481,7 @@ edi_mainview_panel_can_redo(Edi_Mainview_Panel *panel)
 {
Edi_Editor *editor;
 
-   if (!panel->current)
+   if (!panel || !panel->current)
  return EINA_FALSE;
 
editor = (Edi_Editor *)evas_object_data_get(panel->current->view, "editor");
@@ -497,7 +497,7 @@ edi_mainview_panel_modified(Edi_Mainview_Panel *panel)
 {
Edi_Editor *editor;
 
-   if (!panel->current)
+   if (!panel || !panel->current)
  return EINA_FALSE;
 
editor = (Edi_Editor *)evas_object_data_get(panel->current->view, "editor");

-- 

[EGIT] [apps/equate] master 01/01: Fix icon location

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/apps/equate.git/commit/?id=2afdce05eba77d454774fcf57dba38dc4baf3f0a

commit 2afdce05eba77d454774fcf57dba38dc4baf3f0a
Author: Andy Williams 
Date:   Mon Aug 21 15:03:15 2017 +0100

Fix icon location
---
 data/Makefile.am | 2 +-
 src/Makefile.am  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/Makefile.am b/data/Makefile.am
index ce02127..65e5348 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
 desktopdir = $(datadir)/applications
 desktop_DATA = equate.desktop
 
-icondir = $(datadir)/icons
+icondir = $(datadir)/icons/hicolor/256x256/apps
 icon_DATA = equate.png
 
 EXTRA_DIST = equate.png equate.desktop
diff --git a/src/Makefile.am b/src/Makefile.am
index 1b47407..b1be388 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
 -I. \
 -I$(top_srcdir)/lib \
 -I$(top_builddir)/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DPACKAGE_BIN_DIR=\"$(pkgbindir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
 @EFL_CFLAGS@
 
 bin_PROGRAMS = equate

-- 

[EGIT] [tools/edi] master 01/01: build: fall back to make don't try it first.

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=26f65e4167fb29337db00b0c382a6e2fbeeb2b31

commit 26f65e4167fb29337db00b0c382a6e2fbeeb2b31
Author: Andy Williams 
Date:   Fri Aug 18 15:37:07 2017 +0100

build: fall back to make don't try it first.

Other providers have far more specific requirements
---
 src/lib/edi_build_provider.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/edi_build_provider.c b/src/lib/edi_build_provider.c
index 60ddb79..ecfe700 100644
--- a/src/lib/edi_build_provider.c
+++ b/src/lib/edi_build_provider.c
@@ -23,8 +23,6 @@ EAPI Edi_Build_Provider 
*edi_build_provider_for_project_path_get(const char *pat
if (!path)
  return NULL;
 
-   if (_edi_build_provider_make.path_supported_is(path))
- return &_edi_build_provider_make;
if (_edi_build_provider_cmake.path_supported_is(path))
  return &_edi_build_provider_cmake;
if (_edi_build_provider_cargo.path_supported_is(path))
@@ -33,6 +31,8 @@ EAPI Edi_Build_Provider 
*edi_build_provider_for_project_path_get(const char *pat
  return &_edi_build_provider_python;
if (_edi_build_provider_meson.path_supported_is(path))
  return &_edi_build_provider_meson;
+   if (_edi_build_provider_make.path_supported_is(path))
+ return &_edi_build_provider_make;
 
return NULL;
 }

-- 

[EGIT] [tools/edi] master 01/01: ui: fix cancel of goto popup

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=7a8119af6009318d7ce266f8d4de7bc2cdaa9b00

commit 7a8119af6009318d7ce266f8d4de7bc2cdaa9b00
Author: Andy Williams 
Date:   Sat Aug 12 18:00:58 2017 +0100

ui: fix cancel of goto popup
---
 src/bin/mainview/edi_mainview_panel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index dc4c860..cc8d7a0 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -618,7 +618,7 @@ edi_mainview_panel_goto_popup_show(Edi_Mainview_Panel 
*panel)
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, NULL);
+   _edi_popup_cancel_cb, popup);
 
button = elm_button_add(popup);
elm_object_text_set(button, "go");

-- 

[EGIT] [apps/ecrire] master 01/01: ctrl-a is usually select-all, oops

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/apps/ecrire.git/commit/?id=5739b04db6f9ac076cbfa43f60504ef0722816f2

commit 5739b04db6f9ac076cbfa43f60504ef0722816f2
Author: Andy Williams 
Date:   Sat Aug 12 17:46:33 2017 +0100

ctrl-a is usually select-all, oops
---
 src/bin/main.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index b538e5f..993d551 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -593,8 +593,9 @@ _selection_notify(void *data, int type __UNUSED__, void 
*_event)
 */
 
 static void
-_key_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj 
__UNUSED__, void *event)
+_key_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event)
 {
+   Ecrire_Entry *ent = data;
Eina_Bool ctrl, alt, shift;
Evas_Event_Key_Down *ev = event;
 
@@ -605,7 +606,7 @@ _key_cb(void *data __UNUSED__, Evas *e __UNUSED__, 
Evas_Object *obj __UNUSED__,
  return;
 
if (!strcmp(ev->key, "a"))
- _save_as(data, obj, event);
+ elm_entry_select_all(ent->entry);
else if (!strcmp(ev->key, "f"))
  _find(data, obj, event);
else if (!strcmp(ev->key, "g"))

-- 

[EGIT] [apps/ecrire] master 01/01: Add a few more expected key bindings

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/apps/ecrire.git/commit/?id=7614d743557dd21be474ceda2aa7c405b94c34c1

commit 7614d743557dd21be474ceda2aa7c405b94c34c1
Author: Andy Williams 
Date:   Sat Aug 12 17:37:53 2017 +0100

Add a few more expected key bindings
---
 src/bin/main.c | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index 9c2a2e9..b538e5f 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -124,7 +124,7 @@ _cur_changed(void *data, Evas_Object *obj, void *event_info 
__UNUSED__)
col = evas_textblock_cursor_pos_get(mcur) -
   evas_textblock_cursor_pos_get(cur) + 1;
evas_textblock_cursor_free(cur);
-   
+
snprintf(buf, sizeof(buf), _("Ln %d, Col %d"), line, col);
elm_object_text_set(data, buf);
 }
@@ -592,6 +592,30 @@ _selection_notify(void *data, int type __UNUSED__, void 
*_event)
 #endif
 */
 
+static void
+_key_cb(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *obj 
__UNUSED__, void *event)
+{
+   Eina_Bool ctrl, alt, shift;
+   Evas_Event_Key_Down *ev = event;
+
+   ctrl = evas_key_modifier_is_set(ev->modifiers, "Control");
+   alt = evas_key_modifier_is_set(ev->modifiers, "Alt");
+   shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
+   if ((alt) || (!ctrl) || (shift))
+ return;
+
+   if (!strcmp(ev->key, "a"))
+ _save_as(data, obj, event);
+   else if (!strcmp(ev->key, "f"))
+ _find(data, obj, event);
+   else if (!strcmp(ev->key, "g"))
+ _goto_line(data, obj, event);
+   else if (!strcmp(ev->key, "n"))
+ _new(data, obj, event);
+   else if (!strcmp(ev->key, "s"))
+ _save(data, obj, event);
+}
+
 int
 main(int argc, char *argv[])
 {
@@ -707,6 +731,7 @@ main(int argc, char *argv[])
evas_object_smart_callback_add(main_ec_ent->entry, "redo,request", _redo, 
main_ec_ent);
evas_object_smart_callback_add(main_ec_ent->entry, "selection,start", 
_sel_start, main_ec_ent);
evas_object_smart_callback_add(main_ec_ent->entry, "selection,cleared", 
_sel_clear, main_ec_ent);
+   evas_object_event_callback_add(main_ec_ent->entry, EVAS_CALLBACK_KEY_DOWN, 
_key_cb, main_ec_ent);
 
elm_toolbar_item_append(tbar, "document-new", _("New"), _new, main_ec_ent);
elm_toolbar_item_append(tbar, "document-open", _("Open"), _open, 
main_ec_ent);

-- 

[EGIT] [tools/edi] master 01/01: scm: Fix refreshing of panels on stash

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=d4d37a82ea882564107a5a1639ad2533508bfd54

commit d4d37a82ea882564107a5a1639ad2533508bfd54
Author: Andy Williams 
Date:   Wed Aug 9 14:04:52 2017 +0100

scm: Fix refreshing of panels on stash

refresh_all now remembers the right panel
---
 src/bin/mainview/edi_mainview_panel.c | 35 +--
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index 997c0ff..f34682b 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -710,30 +710,37 @@ edi_mainview_panel_close_all(Edi_Mainview_Panel *panel)
Edi_Mainview_Item *it;
 
EINA_LIST_FOREACH(panel->items, item, it)
- {
-if (it)
-  edi_mainview_panel_item_close(panel, it);
- }
+ edi_mainview_panel_item_close(panel, it);
 }
 
 void
 edi_mainview_panel_refresh_all(Edi_Mainview_Panel *panel)
 {
-   Eina_List *item;
+   Eina_List *item, *tabs = NULL;
Edi_Mainview_Item *it;
-   char *path;
+   Edi_Path_Options *options;
 
EINA_LIST_FOREACH(panel->items, item, it)
  {
-if (it)
-  {
- path = strdup(it->path);
- edi_mainview_panel_item_close(panel, it);
- if (ecore_file_exists(path))
-   edi_mainview_panel_open_path(panel, path);
- free(path);
-  }
+options = edi_path_options_create(it->path);
+options->type = eina_stringshare_add(it->mimetype);
+options->background = it != panel->current;
+
+tabs = eina_list_append(tabs, options);
  }
+
+   edi_mainview_panel_close_all(panel);
+
+   EINA_LIST_FOREACH(tabs, item, options)
+ {
+if (!ecore_file_exists(options->path))
+  continue;
+
+edi_mainview_panel_open(panel, options);
+ }
+
+   EINA_LIST_FREE(tabs, options)
+ free(options);
 }
 
 void

-- 

[EGIT] [tools/edi] master 01/01: refactoring mainview panel freeing and docs

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=1bf88c47300f0df00ffb23f4e82994b9a69954e5

commit 1bf88c47300f0df00ffb23f4e82994b9a69954e5
Author: Andy Williams 
Date:   Wed Aug 9 12:46:20 2017 +0100

refactoring mainview panel freeing and docs
---
 src/bin/mainview/edi_mainview.c   | 10 +--
 src/bin/mainview/edi_mainview.h   | 26 +-
 src/bin/mainview/edi_mainview_panel.c | 12 
 src/bin/mainview/edi_mainview_panel.h | 52 +--
 4 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 46c9acf..78db535 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -502,17 +502,9 @@ edi_mainview_panel_remove(Edi_Mainview_Panel *panel)
int panel_id = edi_mainview_panel_id(panel);
 
_edi_project_config_panel_remove(panel_id);
-
-   evas_object_del(panel->welcome);
-   evas_object_del(panel->content);
-   evas_object_del(panel->tabs);
-   evas_object_del(panel->scroll);
-   evas_object_del(panel->box);
+   edi_mainview_panel_free(panel);
 
_edi_mainview_panels = eina_list_remove(_edi_mainview_panels, panel);
-
-   free(panel);
-   panel = NULL;
 }
 
 Edi_Mainview_Panel *
diff --git a/src/bin/mainview/edi_mainview.h b/src/bin/mainview/edi_mainview.h
index acc35e0..b4e7843 100644
--- a/src/bin/mainview/edi_mainview.h
+++ b/src/bin/mainview/edi_mainview.h
@@ -39,6 +39,19 @@ extern "C" {
 void edi_mainview_add(Evas_Object *parent, Evas_Object *win);
 
 /**
+ * @}
+ *
+ *
+ * @brief Content management functions.
+ * @defgroup Content
+ *
+ * @{
+ *
+ * Opening and managing content within the view.
+ *
+ */
+
+/**
  * Close mainview by path.
  *
  * @praram path The path of file to close.
@@ -62,19 +75,6 @@ void edi_mainview_refresh_all(void);
 void edi_mainview_close_all(void);
 
 /**
- * @}
- *
- *
- * @brief Content management functions.
- * @defgroup Content
- *
- * @{
- *
- * Opening and managing content within the view.
- *
- */
-
-/**
  * Open the file at path for editing using the type specified.
  * Supported types are "text" and "image".
  *
diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index 04b0041..997c0ff 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -778,6 +778,18 @@ _edi_mainview_panel_prev_clicked_cb(void *data,
elm_scroller_region_bring_in(scroller, x, y, w, h);
 }
 
+void
+edi_mainview_panel_free(Edi_Mainview_Panel *panel)
+{
+   evas_object_del(panel->welcome);
+   evas_object_del(panel->content);
+   evas_object_del(panel->tabs);
+   evas_object_del(panel->scroll);
+   evas_object_del(panel->box);
+
+   free(panel);
+}
+
 Edi_Mainview_Panel *
 edi_mainview_panel_add(Evas_Object *parent)
 {
diff --git a/src/bin/mainview/edi_mainview_panel.h 
b/src/bin/mainview/edi_mainview_panel.h
index 0c080ea..69d9443 100644
--- a/src/bin/mainview/edi_mainview_panel.h
+++ b/src/bin/mainview/edi_mainview_panel.h
@@ -32,12 +32,12 @@ typedef struct _Edi_Mainview_Panel
 } Edi_Mainview_Panel;
 
 /**
- * @brief Content management functions.
- * @defgroup Content
+ * @brief UI management functions.
+ * @defgroup UI
  *
  * @{
  *
- * Opening and managing content within the view.
+ * Initialisation and management of UI panels.
  *
  */
 
@@ -47,35 +47,35 @@ typedef struct _Edi_Mainview_Panel
  * @param parent The mainview parent into which the panel will be loaded.
  * @return the panel that represents tha added mainview panel.
  *
- * @ingroup Content
+ * @ingroup UI
  */
 Edi_Mainview_Panel *edi_mainview_panel_add(Evas_Object *parent);
 
 /**
- * Close mainview by path.
+ * Free the panel and any related objects.
  *
- * @param panel the mainview panel context
- * @praram path The path of file to close.
+ * @param The panel to free.
  *
- * @ingroup Content
+ * @ingroup UI
  */
-void edi_mainview_panel_item_close_path(Edi_Mainview_Panel *panel, const char 
*path);
+void edi_mainview_panel_free(Edi_Mainview_Panel *panel);
 
 /**
- * Refresh all existing open files.
+ * Close mainview by path.
  *
  * @param panel the mainview panel context
+ * @praram path The path of file to close.
  *
- * @ingroup Content
+ * @ingroup UI
  */
-void edi_mainview_panel_refresh_all(Edi_Mainview_Panel *panel);
+void edi_mainview_panel_item_close_path(Edi_Mainview_Panel *panel, const char 
*path);
 
 /**
  * Close all existing open files.
  *
  * @param panel the mainview panel context
  *
- * @ingroup Content
+ * @ingroup UI
  */
 void edi_mainview_panel_close_all(Edi_Mainview_Panel *panel);
 
@@ -86,7 +86,7 @@ void edi_mainview_panel_close_all(Edi_Mainview_Panel *panel);
  * @param panel the mainview panel context
  * @param path The absolute path of the file to open.
  *
- * @ingroup Content
+ * @ingroup UI
  */
 void edi_mainview_panel_open_pa

[EGIT] [tools/edi] master 02/02: Use EFL release

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=27a7ce8688210d2aa68240ac0c7963c1988535cc

commit 27a7ce8688210d2aa68240ac0c7963c1988535cc
Author: Andy Williams 
Date:   Wed Aug 9 12:28:42 2017 +0100

Use EFL release
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d259f48..858ac91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,7 +71,7 @@ EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
 ### Checks for libraries
 
-requirements_pc_edi="eina >= 1.19.0 evas >= 1.19.0 ecore >= 1.19.0 edje >= 
1.19.0 eo >= 1.19.0 elementary >= 1.19.1 eio >= 1.19.0"
+requirements_pc_edi="eina >= 1.19.0 evas >= 1.19.0 ecore >= 1.19.0 edje >= 
1.19.0 eo >= 1.19.0 elementary >= 1.20.0 eio >= 1.19.0"
 AC_SUBST([requirements_pc_edi])
 PKG_CHECK_MODULES([EFL], [${requirements_pc_edi}])
 

-- 

[EGIT] [tools/edi] master 01/02: mainview: Fix potential segvs from D5052

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=f4ef9bb35c101fab7bc75abe6158e77508f71c64

commit f4ef9bb35c101fab7bc75abe6158e77508f71c64
Author: Andy Williams 
Date:   Wed Aug 9 12:28:20 2017 +0100

mainview: Fix potential segvs from D5052
---
 src/bin/mainview/edi_mainview_panel.c | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index 2b3d05e..04b0041 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -95,7 +95,8 @@ edi_mainview_panel_item_prev(Edi_Mainview_Panel *panel)
if (first == panel->current)
  {
 prev = eina_list_nth(panel->items, eina_list_count(panel->items)-1);
-edi_mainview_panel_item_select(panel, prev);
+if (prev)
+  edi_mainview_panel_item_select(panel, prev);
 return;
  }
 
@@ -124,7 +125,8 @@ edi_mainview_panel_item_next(Edi_Mainview_Panel *panel)
if (last == panel->current)
  {
 next = eina_list_nth(panel->items, 0);
-edi_mainview_panel_item_select(panel, next);
+if (next)
+  edi_mainview_panel_item_select(panel, next);
 return;
  }
 

-- 

[EGIT] [core/efl] master 01/01: elm_code: small optimisation for large files

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=91293d3b25e114caa6db28603bdd453537966018

commit 91293d3b25e114caa6db28603bdd453537966018
Author: Andy Williams 
Date:   Wed Aug 2 10:32:13 2017 +0100

elm_code: small optimisation for large files
---
 src/lib/elementary/elm_code_widget.c | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index ceea5d2c47..2529321cac 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -466,10 +466,14 @@ static void
 _elm_code_widget_fill(Elm_Code_Widget *widget)
 {
Elm_Code_Widget_Data *pd;
+   unsigned int height;
 
pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
+   height = elm_code_widget_lines_visible_get(widget);
+   if (height > elm_code_file_lines_get(pd->code->file))
+ height = elm_code_file_lines_get(pd->code->file);
 
-   _elm_code_widget_fill_update(widget, 1, 
elm_code_file_lines_get(pd->code->file), NULL);
+   _elm_code_widget_fill_update(widget, 1, height, NULL);
 }
 
 static void

-- 

[EGIT] [tools/edi] master 01/01: mainview: fix removal of panels from the ui

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=cb39c546feb54e1fd52cb9371898bfb6f215cab8

commit cb39c546feb54e1fd52cb9371898bfb6f215cab8
Author: Andy Williams 
Date:   Wed Jul 26 10:17:44 2017 +0100

mainview: fix removal of panels from the ui

This removes resizable panels for now but they were not really supported 
anyway...
---
 src/bin/mainview/edi_mainview.c | 41 ++---
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index be3db01..46c9acf 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -19,7 +19,7 @@
 #include "edi_private.h"
 #include "edi_config.h"
 
-static Evas_Object *_main_win, *_mainview_panel, *_mainview_parent;
+static Evas_Object *_main_win, *_mainview_panel;
 static Evas_Object *_edi_mainview_search_project_popup;
 
 static Edi_Mainview_Panel *_current_panel;
@@ -519,50 +519,21 @@ Edi_Mainview_Panel *
 edi_mainview_panel_append()
 {
Edi_Mainview_Panel *panel;
-   Evas_Object *split, *box;
 
-   elm_box_unpack_all(_mainview_parent);
-
-   split = elm_panes_add(_mainview_parent);
-   evas_object_size_hint_weight_set(split, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(split, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_show(split);
-   elm_box_pack_end(_mainview_parent, split);
-
-   box = elm_box_add(_mainview_parent);
-   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_show(box);
-
-   elm_object_part_content_set(split, "left", _mainview_panel);
-   elm_object_part_content_set(split, "right", box);
-
-   panel = edi_mainview_panel_add(box);
+   panel = edi_mainview_panel_add(_mainview_panel);
+   _current_panel = panel;
_edi_mainview_panels = eina_list_append(_edi_mainview_panels, panel);
 
-   _mainview_panel = split;
-
return panel;
 }
 
 void
 edi_mainview_add(Evas_Object *parent, Evas_Object *win)
 {
-   Edi_Mainview_Panel *panel;
-   Evas_Object *box;
-
+   _mainview_panel = parent;
_main_win = win;
-   _mainview_parent = parent;
-
-   box = elm_box_add(parent);
-   evas_object_size_hint_weight_set(box, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
-   evas_object_size_hint_align_set(box, EVAS_HINT_FILL, EVAS_HINT_FILL);
-   evas_object_show(box);
-   elm_box_pack_end(parent, box);
-   _mainview_panel = box;
 
-   panel = edi_mainview_panel_add(box);
-   _current_panel = panel;
-   _edi_mainview_panels = eina_list_append(_edi_mainview_panels, panel);
+   elm_box_horizontal_set(parent, EINA_TRUE);
+   edi_mainview_panel_append();
 }
 

-- 

[EGIT] [core/efl] master 01/01: elm_code: Fix missing middle button selection paste

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=77db870b6150d6f1bbc0ba6185bd3e14dd217c6b

commit 77db870b6150d6f1bbc0ba6185bd3e14dd217c6b
Author: Andy Williams 
Date:   Tue Jul 25 23:54:21 2017 +0100

elm_code: Fix missing middle button selection paste

Resolves task T5520
@fix
---
 src/lib/elementary/elm_code_widget.c | 32 +---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index 04f20edcd6..2846959f7c 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -969,6 +969,24 @@ _elm_code_widget_clicked_readonly_cb(Elm_Code_Widget 
*widget, unsigned int row)
 }
 
 static void
+_mouse_selection_paste_at_position(Elm_Code_Widget *widget,
+   unsigned int row, unsigned int col)
+{
+   char *text;
+
+   if (elm_code_widget_selection_is_empty(widget))
+ return;
+
+   text = elm_code_widget_selection_text_get(widget);
+   elm_code_widget_selection_clear(widget);
+
+   elm_code_widget_cursor_position_set(widget, row, col);
+   elm_code_widget_text_at_cursor_insert(widget, text);
+
+   free(text);
+}
+
+static void
 _elm_code_widget_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
void *event_info)
 {
@@ -986,10 +1004,18 @@ _elm_code_widget_mouse_down_cb(void *data, Evas *e 
EINA_UNUSED, Evas_Object *obj
 
ctrl = evas_key_modifier_is_set(event->modifiers, "Control");
shift = evas_key_modifier_is_set(event->modifiers, "Shift");
-   if (event->button == 3 && !ctrl)
+   if (!ctrl)
  {
-_popup_menu_show(widget, event->canvas.x, event->canvas.y);
-return;
+if (event->button == 3)
+  {
+ _popup_menu_show(widget, event->canvas.x, event->canvas.y);
+ return;
+  }
+   else if (event->button == 2)
+  {
+ _mouse_selection_paste_at_position(widget, row, col);
+ return;
+  }
  }
 
if (!shift)

-- 

[EGIT] [tools/edi] master 01/01: filepanel: reorder menu

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=dcd611c31f75bde10dac5c3853a7722a7ff970d7

commit dcd611c31f75bde10dac5c3853a7722a7ff970d7
Author: Andy Williams 
Date:   Tue Jul 25 22:52:39 2017 +0100

filepanel: reorder menu
---
 src/bin/edi_filepanel.c | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index d928c75..3188f97 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -241,16 +241,17 @@ _item_menu_create(Evas_Object *win, Edi_Dir_Data *sd)
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);
 
-   menu_it = elm_menu_item_add(menu, NULL, "gtk-execute", "open external",
-   _item_menu_xdgopen_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);
_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, "object-flip-horizontal", "open in 
new panel", _item_menu_open_panel_cb, sd);
+   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);

-- 

[EGIT] [tools/edi] master 01/01: settings: fix graphical glitch on smaller screens

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=fae8350ea11f8108881756f0e80cc8d82b7f3338

commit fae8350ea11f8108881756f0e80cc8d82b7f3338
Author: Andy Williams 
Date:   Mon Jul 24 23:35:30 2017 +0100

settings: fix graphical glitch on smaller screens
---
 src/bin/screens/edi_settings.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/bin/screens/edi_settings.c b/src/bin/screens/edi_settings.c
index 95a73f4..a28f5d4 100644
--- a/src/bin/screens/edi_settings.c
+++ b/src/bin/screens/edi_settings.c
@@ -133,6 +133,7 @@ _edi_settings_font_preview_add(Evas_Object *parent, const 
char *font_name, int f
elm_obj_code_widget_font_set(widget, font_name, font_size);
elm_obj_code_widget_line_numbers_set(widget, EINA_TRUE);
elm_obj_code_widget_editable_set(widget, EINA_FALSE);
+   elm_obj_code_widget_policy_set(widget, ELM_SCROLLER_POLICY_OFF, 
ELM_SCROLLER_POLICY_OFF);
evas_object_size_hint_weight_set(widget, EVAS_HINT_EXPAND, 
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(widget, EVAS_HINT_FILL, EVAS_HINT_FILL);
evas_object_show(widget);

-- 

[EGIT] [tools/edi] master 01/01: config: Save the current tab of each panel

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=9d0db1a1a55a9f8269603f415770baca3c73e072

commit 9d0db1a1a55a9f8269603f415770baca3c73e072
Author: Andy Williams 
Date:   Mon Jul 24 23:28:48 2017 +0100

config: Save the current tab of each panel

This needed a refactor to do properly so your open tabs
will be forgotten, sorry :(
---
 src/bin/edi_config.c  | 110 ++
 src/bin/edi_config.h  |  17 --
 src/bin/edi_main.c|  73 +-
 src/bin/mainview/edi_mainview.c   |  20 ++-
 src/bin/mainview/edi_mainview.h   |   2 +
 src/bin/mainview/edi_mainview_panel.c |   7 ++-
 6 files changed, 168 insertions(+), 61 deletions(-)

diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c
index d108830..d7f39b8 100644
--- a/src/bin/edi_config.c
+++ b/src/bin/edi_config.c
@@ -41,8 +41,8 @@
 #  define EDI_CONFIG_FILE_VERSION \
((EDI_CONFIG_FILE_EPOCH << 16) | EDI_CONFIG_FILE_GENERATION)
 
-#  define EDI_PROJECT_CONFIG_FILE_EPOCH 0x0001
-#  define EDI_PROJECT_CONFIG_FILE_GENERATION 0x0003
+#  define EDI_PROJECT_CONFIG_FILE_EPOCH 0x0002
+#  define EDI_PROJECT_CONFIG_FILE_GENERATION 0x0004
 #  define EDI_PROJECT_CONFIG_FILE_VERSION \
((EDI_PROJECT_CONFIG_FILE_EPOCH << 16) | EDI_PROJECT_CONFIG_FILE_GENERATION)
 
@@ -56,6 +56,7 @@ static Edi_Config_DD *_edi_cfg_mime_edd = NULL;
 
 static Edi_Project_Config_DD *_edi_proj_cfg_edd = NULL;
 static Edi_Project_Config_DD *_edi_proj_cfg_tab_edd = NULL;
+static Edi_Project_Config_DD *_edi_proj_cfg_panel_edd = NULL;
 
 /* external variables */
 Edi_Config *_edi_config = NULL;
@@ -124,12 +125,23 @@ _edi_config_cb_free(void)
 static void
 _edi_project_config_cb_free(void)
 {
+   Edi_Project_Config_Panel *panel;
Edi_Project_Config_Tab *tab;
 
if (!_edi_project_config)
  return;
 
-   EINA_LIST_FREE(_edi_project_config->tabs, tab)
+   EINA_LIST_FREE(_edi_project_config->panels, panel)
+ {
+EINA_LIST_FREE(panel->tabs, tab)
+  {
+ if (tab->path) eina_stringshare_del(tab->path);
+ if (tab->type) eina_stringshare_del(tab->type);
+ free(tab);
+  }
+ }
+
+   EINA_LIST_FREE(_edi_project_config->windows, tab)
  {
 if (tab->path) eina_stringshare_del(tab->path);
 if (tab->type) eina_stringshare_del(tab->type);
@@ -233,8 +245,14 @@ _edi_config_init(void)
#define D _edi_proj_cfg_tab_edd
EDI_CONFIG_VAL(D, T, path, EET_T_STRING);
EDI_CONFIG_VAL(D, T, type, EET_T_STRING);
-   EDI_CONFIG_VAL(D, T, windowed, EET_T_UCHAR);
-   EDI_CONFIG_VAL(D, T, panel_id, EET_T_INT);
+
+   _edi_proj_cfg_panel_edd = EDI_CONFIG_DD_NEW("Project_Config_Panel", 
Edi_Project_Config_Panel);
+   #undef T
+   #undef D
+   #define T Edi_Project_Config_Panel
+   #define D _edi_proj_cfg_panel_edd
+   EDI_CONFIG_LIST(D, T, tabs, _edi_proj_cfg_tab_edd);
+   EDI_CONFIG_VAL(D, T, current_tab, EET_T_UINT);
 
_edi_proj_cfg_edd = EDI_CONFIG_DD_NEW("Project_Config", Edi_Project_Config);
#undef T
@@ -258,14 +276,14 @@ _edi_config_init(void)
EDI_CONFIG_VAL(D, T, gui.toolbar_hidden, EET_T_UCHAR);
EDI_CONFIG_VAL(D, T, gui.tab_inserts_spaces, EET_T_UCHAR);
 
-   EDI_CONFIG_LIST(D, T, tabs, _edi_proj_cfg_tab_edd);
-   EDI_CONFIG_VAL(D, T, current_tab, EET_T_UINT);
EDI_CONFIG_VAL(D, T, launch.path, EET_T_STRING);
EDI_CONFIG_VAL(D, T, launch.args, EET_T_STRING);
-
EDI_CONFIG_VAL(D, T, user_fullname, EET_T_STRING);
EDI_CONFIG_VAL(D, T, user_email, EET_T_STRING);
 
+   EDI_CONFIG_LIST(D, T, panels, _edi_proj_cfg_panel_edd);
+   EDI_CONFIG_LIST(D, T, windows, _edi_proj_cfg_tab_edd);
+
_edi_config_load();
 
return EINA_TRUE;
@@ -414,6 +432,17 @@ _edi_config_mime_search(const char *mime)
return NULL;
 }
 
+static Edi_Project_Config_Panel *
+_panel_add()
+{
+   Edi_Project_Config_Panel *panel;
+
+   panel = calloc(1, sizeof(Edi_Project_Config_Panel));
+
+   _edi_project_config->panels = eina_list_append(_edi_project_config->panels, 
panel);
+   return panel;
+}
+
 Eina_Bool
 _edi_project_config_save_no_notify()
 {
@@ -477,8 +506,6 @@ _edi_project_config_load()
_edi_project_config->gui.width_marker = 80;
_edi_project_config->gui.tabstop = 8;
_edi_project_config->gui.toolbar_hidden = EINA_FALSE;
-
-   _edi_project_config->tabs = NULL;
IFPCFGEND;
 
IFPCFG(0x0002);
@@ -500,22 +527,55 @@ _edi_project_config_load()
 
_edi_project_config->version = EDI_PROJECT_CONFIG_FILE_VERSION;
 
+   IFPCFG(0x0004);
+   _edi_project_config->panels = NULL;
+   _panel_add();
+   _edi_project_config->windows = NULL;
+   IFPCFGEND;
+
if (save) _edi_project_config_save_no_notify();
 }
 
+Eina_List **
+_tablist_get(Eina_Bool windowed, int panel_id)
+{
+   Edi_Project_Config_Panel *panel;
+
+   if (windowed)
+ return &

[EGIT] [tools/edi] master 01/01: panels: Track focus of editors when we're changing panel

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=804d14cef36c0af453915d866b95b24c969f9c11

commit 804d14cef36c0af453915d866b95b24c969f9c11
Author: Andy Williams 
Date:   Mon Jul 24 18:27:45 2017 +0100

panels: Track focus of editors when we're changing panel
---
 src/bin/editor/edi_editor.c   | 13 +
 src/bin/mainview/edi_mainview_panel.c |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 07452aa..d9fb404 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -962,6 +962,18 @@ _edi_clang_dispose(void *data, Ecore_Thread *thread 
EINA_UNUSED)
 #endif
 
 static void
+_focused_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info 
EINA_UNUSED)
+{
+   Edi_Mainview_Panel *panel;
+   Edi_Mainview_Item *item;
+
+   item = (Edi_Mainview_Item *)data;
+   panel = edi_mainview_panel_for_item_get(item);
+
+   edi_mainview_panel_focus(panel);
+}
+
+static void
 _unfocused_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info 
EINA_UNUSED)
 {
Edi_Editor *editor;
@@ -1115,6 +1127,7 @@ edi_editor_add(Evas_Object *parent, Edi_Mainview_Item 
*item)
   _smart_cb_key_down, editor);
evas_object_smart_callback_add(widget, "changed,user", _changed_cb, editor);
evas_object_event_callback_add(widget, EVAS_CALLBACK_MOUSE_UP, 
_mouse_up_cb, editor);
+   evas_object_smart_callback_add(widget, "focused", _focused_cb, item);
evas_object_smart_callback_add(widget, "unfocused", _unfocused_cb, editor);
 
elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_TODO);
diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index e558d32..f97d2a5 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -245,6 +245,7 @@ edi_mainview_panel_item_select(Edi_Mainview_Panel *panel, 
Edi_Mainview_Item *ite
 _edi_project_config_save_no_notify();
  }
 
+   edi_mainview_panel_focus(panel);
ecore_event_add(EDI_EVENT_TAB_CHANGED, NULL, NULL, NULL);
 }
 
@@ -255,7 +256,6 @@ _promote(void *data, Evas_Object *obj EINA_UNUSED,
Edi_Mainview_Panel *panel;
 
panel = edi_mainview_panel_for_item_get((Edi_Mainview_Item *)data);
-   edi_mainview_panel_focus(panel);
edi_mainview_panel_item_select(panel, (Edi_Mainview_Item *)data);
 }
 

-- 

[EGIT] [tools/edi] master 01/02: config: Be less notification-happy when saving

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=a437b5202a8cfe2e08ebe7d336b3fe550979587b

commit a437b5202a8cfe2e08ebe7d336b3fe550979587b
Author: Andy Williams 
Date:   Mon Jul 24 13:22:19 2017 +0100

config: Be less notification-happy when saving

Let's not force all our editors to reload when we don't have to!
---
 src/bin/edi_config.c  | 32 
 src/bin/edi_private.h |  2 ++
 src/bin/mainview/edi_mainview_panel.c |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c
index f1fcaa7..d108830 100644
--- a/src/bin/edi_config.c
+++ b/src/bin/edi_config.c
@@ -342,8 +342,8 @@ _edi_config_load(void)
 void
 _edi_config_save(void)
 {
-   if (_edi_config_domain_save(_edi_config_dir_get(), EDI_CONFIG_NAME, 
_edi_cfg_edd, _edi_config))
- ecore_event_add(EDI_EVENT_CONFIG_CHANGED, NULL, NULL, NULL);
+   if (!_edi_config_domain_save(_edi_config_dir_get(), EDI_CONFIG_NAME, 
_edi_cfg_edd, _edi_config))
+ ERR("Could not save configuration");
 }
 
 void
@@ -414,6 +414,19 @@ _edi_config_mime_search(const char *mime)
return NULL;
 }
 
+Eina_Bool
+_edi_project_config_save_no_notify()
+{
+   return _edi_config_domain_save(_edi_project_config_dir_get(), 
EDI_PROJECT_CONFIG_NAME, _edi_proj_cfg_edd, _edi_project_config);
+}
+
+void
+_edi_project_config_save()
+{
+   if (_edi_project_config_save_no_notify())
+ ecore_event_add(EDI_EVENT_CONFIG_CHANGED, NULL, NULL, NULL);
+}
+
 void
 _edi_project_config_load()
 {
@@ -487,20 +500,7 @@ _edi_project_config_load()
 
_edi_project_config->version = EDI_PROJECT_CONFIG_FILE_VERSION;
 
-   if (save) _edi_project_config_save();
-}
-
-static Eina_Bool
-_edi_project_config_save_no_notify()
-{
-   return _edi_config_domain_save(_edi_project_config_dir_get(), 
EDI_PROJECT_CONFIG_NAME, _edi_proj_cfg_edd, _edi_project_config);
-}
-
-void
-_edi_project_config_save()
-{
-   if (_edi_project_config_save_no_notify())
- ecore_event_add(EDI_EVENT_CONFIG_CHANGED, NULL, NULL, NULL);
+   if (save) _edi_project_config_save_no_notify();
 }
 
 void
diff --git a/src/bin/edi_private.h b/src/bin/edi_private.h
index 470cdf7..2b7cfbc 100644
--- a/src/bin/edi_private.h
+++ b/src/bin/edi_private.h
@@ -45,4 +45,6 @@ Eina_Bool edi_noproject();
 
 void edi_launcher_config_missing();
 
+Eina_Bool _edi_project_config_save_no_notify(void);
+
 #endif
diff --git a/src/bin/mainview/edi_mainview_panel.c 
b/src/bin/mainview/edi_mainview_panel.c
index 0c28357..e558d32 100644
--- a/src/bin/mainview/edi_mainview_panel.c
+++ b/src/bin/mainview/edi_mainview_panel.c
@@ -242,7 +242,7 @@ edi_mainview_panel_item_select(Edi_Mainview_Panel *panel, 
Edi_Mainview_Item *ite
 evas_object_geometry_get(item->tab, NULL, NULL, &tabw, NULL);
 elm_scroller_region_bring_in(panel->tabs, region_x, 0, tabw, 0);
 _edi_project_config->current_tab = 
edi_mainview_panel_item_current_tab_get(panel);
-_edi_project_config_save();
+_edi_project_config_save_no_notify();
  }
 
ecore_event_add(EDI_EVENT_TAB_CHANGED, NULL, NULL, NULL);

-- 

[EGIT] [tools/edi] master 02/02: update feature list

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=5cc9033fb23267bf0a9dd66b9e36cce52a1f8f85

commit 5cc9033fb23267bf0a9dd66b9e36cce52a1f8f85
Author: Andy Williams 
Date:   Mon Jul 24 13:23:34 2017 +0100

update feature list
---
 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 03a9661..03dd768 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Edi 0.6
 
 Features:
 
+  * Multiple panel support in main UI
   * Integrate GDB debugger console
   * Add snippet support to the code editor
   * Add SCM support (git)
@@ -12,7 +13,7 @@ Features:
 
 Bug fixes:
 
-  * Fix issue where large projects could cause slow starts 
+  * Fix issue where large projects could cause slow starts
 
 -
 Edi 0.5.1

-- 

[EGIT] [core/efl] master 01/01: elm_code: Fix crash with long lines

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=292e9e9ecf456cda79b287fe65c16d90f14da325

commit 292e9e9ecf456cda79b287fe65c16d90f14da325
Author: Andy Williams 
Date:   Sun Jul 23 21:30:35 2017 +0100

elm_code: Fix crash with long lines

Also fixes issue where widget would sometimes blank when scrolling
@fix
---
 src/lib/elementary/elm_code_widget.c  | 31 ---
 src/lib/elementary/elm_code_widget_text.c |  9 +++--
 2 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/lib/elementary/elm_code_widget.c 
b/src/lib/elementary/elm_code_widget.c
index c0b4da73ff..04f20edcd6 100644
--- a/src/lib/elementary/elm_code_widget.c
+++ b/src/lib/elementary/elm_code_widget.c
@@ -1890,28 +1890,11 @@ _elm_code_widget_resize(Elm_Code_Widget *widget, 
Elm_Code_Line *newline)
w = 0;
h = elm_code_file_lines_get(pd->code->file);
 
-   if (newline)
+   EINA_LIST_FOREACH(pd->code->file->lines, item, line)
  {
-line = eina_list_data_get(pd->code->file->lines);
-if (line)
-  {
- line_width = elm_code_widget_line_text_column_width_get(widget, 
newline);
- w = (int) line_width + gutter + 1;
-  }
 line_width = elm_code_widget_line_text_column_width_get(widget, line);
 if ((int) line_width + gutter + 1 > w)
-  {
- w = (int) line_width + gutter + 1;
-  }
- }
-   else
- {
-EINA_LIST_FOREACH(pd->code->file->lines, item, line)
-  {
- line_width = elm_code_widget_line_text_column_width_get(widget, 
line);
- if ((int) line_width + gutter + 1 > w)
-   w = (int) line_width + gutter + 1;
-  }
+  w = (int) line_width + gutter + 1;
  }
 
_elm_code_widget_ensure_n_grid_rows(widget, h);
@@ -1920,13 +1903,16 @@ _elm_code_widget_resize(Elm_Code_Widget *widget, 
Elm_Code_Line *newline)
  ww = w*cw;
if (h*ch > wh)
  wh = h*ch;
-   if (cw > 0)
- pd->col_count = ww/cw + 1;
+
+   if (cw > 0 && ww/cw > w)
+ pd->col_count = ww/cw;
+   else
+ pd->col_count = w;
 
EINA_LIST_FOREACH(pd->grids, item, grid)
  {
 evas_object_textgrid_size_set(grid, pd->col_count, 1);
-evas_object_size_hint_min_set(grid, w*cw, ch);
+evas_object_size_hint_min_set(grid, ww, ch);
  }
 
if (!newline)
@@ -1940,7 +1926,6 @@ _elm_code_widget_resize(Elm_Code_Widget *widget, 
Elm_Code_Line *newline)
 
 return;
  }
-   _elm_code_widget_fill_line(widget, line);
 
if (pd->gravity_x == 1.0 || pd->gravity_y == 1.0)
  _elm_code_widget_scroll_by(widget,
diff --git a/src/lib/elementary/elm_code_widget_text.c 
b/src/lib/elementary/elm_code_widget_text.c
index 879a0a7ecf..43cce43a97 100644
--- a/src/lib/elementary/elm_code_widget_text.c
+++ b/src/lib/elementary/elm_code_widget_text.c
@@ -199,14 +199,21 @@ static void
 _elm_code_widget_text_insert_single(Elm_Code_Widget *widget, Elm_Code *code,
 unsigned int col, unsigned int row, const 
char *text, unsigned int len)
 {
+   Elm_Code_Widget_Data *pd;
Elm_Code_Line *line;
unsigned int position, newcol;
 
+   pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS);
line = elm_code_file_line_get(code->file, row);
position = elm_code_widget_line_text_position_for_column_get(widget, line, 
col);
elm_code_line_text_insert(line, position, text, len);
 
newcol = elm_code_widget_line_text_column_width_to_position(widget, line, 
position + len);
+
+   // if we are making a line longer than before then we need to resize
+   if (newcol > pd->col_count)
+ _elm_code_widget_resize(widget, line);
+
elm_obj_code_widget_cursor_position_set(widget, row, newcol);
 }
 
@@ -286,8 +293,6 @@ _elm_code_widget_text_at_cursor_insert_do(Elm_Code_Widget 
*widget, const char *t
  _elm_code_widget_text_insert_multi(widget, code, col, row, text, length);
elm_obj_code_widget_cursor_position_get(widget, &end_row, &end_col);
 
-   // a workaround for when the cursor position would be off the line width
-   _elm_code_widget_resize(widget, line);
efl_event_callback_legacy_call(widget, 
ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 
if (undo)

-- 

[EGIT] [admin/devs] master 01/01: Different key for a different location

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/admin/devs.git/commit/?id=3090387e9bc01ada94e31437d06807f251c469fc

commit 3090387e9bc01ada94e31437d06807f251c469fc
Author: Andy Williams 
Date:   Tue Jul 18 16:45:39 2017 +0100

Different key for a different location
---
 developers/ajwillia-ms/id_rsa_tower.pub | 1 +
 1 file changed, 1 insertion(+)

diff --git a/developers/ajwillia-ms/id_rsa_tower.pub 
b/developers/ajwillia-ms/id_rsa_tower.pub
new file mode 100755
index 000..bae64fc
--- /dev/null
+++ b/developers/ajwillia-ms/id_rsa_tower.pub
@@ -0,0 +1 @@
+ssh-rsa 
B3NzaC1yc2EDAQABAAACAQCiAqNFaVjDzvhUW2qF/njZ2Emrux9unLrJ36FgN93iLqyrkc6GIgVO5DHgvoakwoDyRI3LaRQ/T5bUl3M6DWuXwr79v5yP+Oxh12vVtNnyQXvMLvmA9AS64NvZ7lCQ/teHSctt+PQx/NXWiLyWTj9D70F4Wskrx3PI6vb1iOEwq4J+F5Tz3dpgcL2DYmjU2LMTwC5k1IAaQTYCIbraIH5tc5D2anJWiKxFFoyLGMCfnEnpGJs/DARGqA2DPT6H2nEH00Joa06JYIz2u8HzIWlM1l23WF0Cc6zcWpfJQlFMLlsD5VAMCFRrBv6m8CnO9RgJ+nuxaTF2fn5rHYFG2sEo6f05xg8N2O/K6pI+IVXkLlkGiXGsxoymvSH3HtKmzCEIIpHdtLJDILhGfbzrpCXoOLAhc4o/hhfSGOrt8SjDMUBZ2MFHegySrCFk/fEGh52FkawT
 [...]

-- 

[EGIT] [core/efl] master 01/01: OSX: fix version detection in build

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=bf8a0eead2c50a9ba9d671d41ac2d4f39ef6d195

commit bf8a0eead2c50a9ba9d671d41ac2d4f39ef6d195
Author: Andy Williams 
Date:   Mon Jul 17 13:04:30 2017 +0100

OSX: fix version detection in build
---
 src/lib/ecore_cocoa/ecore_cocoa_private.h | 2 +-
 src/lib/eina/eina_lock.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/ecore_cocoa/ecore_cocoa_private.h 
b/src/lib/ecore_cocoa/ecore_cocoa_private.h
index d2c67ac40d..ab1ac7ed61 100644
--- a/src/lib/ecore_cocoa/ecore_cocoa_private.h
+++ b/src/lib/ecore_cocoa/ecore_cocoa_private.h
@@ -33,7 +33,7 @@ extern int _ecore_cocoa_log_domain;
  * more meaningful ones. We define aliases to these new types to use the
  * most recent API while being retro-compatible.
  */
-#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1012 /* Before 10.12 */
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200 /* Before 10.12 */
 # define NSWindowStyleMaskTitled NSTitledWindowMask
 # define NSWindowStyleMaskClosable NSClosableWindowMask
 # define NSWindowStyleMaskResizable NSResizableWindowMask
diff --git a/src/lib/eina/eina_lock.c b/src/lib/eina/eina_lock.c
index e8872a65a1..3423852a8d 100644
--- a/src/lib/eina/eina_lock.c
+++ b/src/lib/eina/eina_lock.c
@@ -17,7 +17,7 @@
  * stdbool.h, which is not wanted: it would introduce new macros,
  * and break compilation of existing programs.
  */
-# if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1012
+# if __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200
 #  include 
 #  define SPINLOCK_GET(LCK) ((os_unfair_lock_t)(LCK))
 # else

-- 

[EGIT] [website/www-content] master 01/01: Split out basics from extra dev docs

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=5c6b9c41b2cdb70cf1e1800a3c36fc479a365586

commit 5c6b9c41b2cdb70cf1e1800a3c36fc479a365586
Author: Andy Williams 
Date:   Sun Jul 16 19:56:45 2017 +0100

Split out basics from extra dev docs
---
 pages/docs.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pages/docs.txt b/pages/docs.txt
index 07e54d0e..9d69a93c 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -94,6 +94,8 @@ team, how we work, and earn a place on the team as a core 
developer :)
 
 
 
+
+
 That's it for the basics - hopefully you are now up and running with
 the EFL (and perhaps Enlightenment too!) and looking to learn more.
 Here is a collection of guides and tutorials to help you get deeper into

-- 

[EGIT] [website/www] master 01/01: Flow columns with better whitespace

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=f135a3208dbf88c75a7832e552c6a520efb9982d

commit f135a3208dbf88c75a7832e552c6a520efb9982d
Author: Andy Williams 
Date:   Sun Jul 16 19:54:16 2017 +0100

Flow columns with better whitespace
---
 public_html/lib/tpl/e/css/modifications.css | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/public_html/lib/tpl/e/css/modifications.css 
b/public_html/lib/tpl/e/css/modifications.css
index 602d511..c649cf1 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -682,8 +682,14 @@ table {
box-shadow: none;
 }
 
+table.columns-plugin {
+   border: none;
+}
+
 table.columns-plugin td {
vertical-align: top;
+   border: none;
+   padding: 15px;
 }
 
 #ircbubble {

-- 

[EGIT] [website/www-content] master 01/01: docs: link to more useful dev docs

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=2d2157aeeed31a86d9ef183bb7e4081a37bde41d

commit 2d2157aeeed31a86d9ef183bb7e4081a37bde41d
Author: Andy Williams 
Date:   Sun Jul 16 10:33:18 2017 +0100

docs: link to more useful dev docs
---
 pages/docs.txt | 4 
 1 file changed, 4 insertions(+)

diff --git a/pages/docs.txt b/pages/docs.txt
index 8930a884..07e54d0e 100755
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -87,6 +87,10 @@ team, how we work, and earn a place on the team as a core 
developer :)
   * [[debugging/apps_efl_debugging|EFL application debugging]]
   * [[debugging/remote_debugging|Remote Debugging]]
 
+=== Coding ===
+
+  * [[https://phab.enlightenment.org/w/ecoding/|EFL Coding Style]]
+  * [[https://phab.enlightenment.org/w/git_practices/|Git Practices]]
 
 
 

-- 

[EGIT] [tools/edi] master 01/01: Fix tests check / defaults

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=be2e8af7b4e5f2630c35c71a50ae859c74dfd0b2

commit be2e8af7b4e5f2630c35c71a50ae859c74dfd0b2
Author: Andy Williams 
Date:   Sun Jul 16 00:07:18 2017 +0100

Fix tests check / defaults
---
 configure.ac| 4 ++--
 data/extra/skeleton/eflproject/configure.ac | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 039ea12..d259f48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,8 +13,8 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 # Check for tests and coverage
 AC_ARG_WITH([tests],
-   [AS_HELP_STRING([--with-tests=none|regular|coverage],
-   [choose testing method: regular, coverage or none.
+   [AS_HELP_STRING([--with-tests=none|tests|coverage],
+   [choose testing method: tests, coverage or none.
 @<:@default=auto@:>@])],
[build_tests=${withval}],
[build_tests=auto])
diff --git a/data/extra/skeleton/eflproject/configure.ac 
b/data/extra/skeleton/eflproject/configure.ac
index 8c4b311..d4dfa11 100644
--- a/data/extra/skeleton/eflproject/configure.ac
+++ b/data/extra/skeleton/eflproject/configure.ac
@@ -39,9 +39,9 @@ PKG_CHECK_MODULES([EFL],
 
 # Check for tests and coverage
 AC_ARG_WITH([tests],
-   [AC_HELP_STRING([--with-tests=none|regular|coverage],
-   [choose testing method: regular, coverage or none.
-@<:@default=none@:>@])],
+   [AC_HELP_STRING([--with-tests=none|tests|coverage],
+   [choose testing method: tests, coverage or none.
+@<:@default=auto@:>@])],
[build_tests=${withval}],
[build_tests=auto])
 

-- 

[EGIT] [website/www] master 01/01: Columns should top align

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=21252a576b3222ebfdc23d2251bb51bd7c81b838

commit 21252a576b3222ebfdc23d2251bb51bd7c81b838
Author: Andy Williams 
Date:   Sat Jul 15 23:16:30 2017 +0100

Columns should top align
---
 public_html/lib/tpl/e/css/modifications.css | 4 
 1 file changed, 4 insertions(+)

diff --git a/public_html/lib/tpl/e/css/modifications.css 
b/public_html/lib/tpl/e/css/modifications.css
index 059f2d2..602d511 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -682,6 +682,10 @@ table {
box-shadow: none;
 }
 
+table.columns-plugin td {
+   vertical-align: top;
+}
+
 #ircbubble {
background-color: #181818;
border-radius: 10px;

-- 

[EGIT] [website/www-content] master 01/01: docs: Add a little layout to our documentation landing page.

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=4801c2a624ffdcc68a28f77017d65323996d3e8f

commit 4801c2a624ffdcc68a28f77017d65323996d3e8f
Author: Andy Williams 
Date:   Sat Jul 15 23:10:38 2017 +0100

docs: Add a little layout to our documentation landing page.

There is more to do here, but this is a start.
Give folk a better first-search experience for our wealth of documentation
---
 pages/docs.txt | 120 +++--
 1 file changed, 83 insertions(+), 37 deletions(-)

diff --git a/pages/docs.txt b/pages/docs.txt
old mode 100644
new mode 100755
index 470c18a6..8930a884
--- a/pages/docs.txt
+++ b/pages/docs.txt
@@ -2,7 +2,17 @@
 
 {{page>start-shortcuts}}
 
- Getting into Development 
+ Enlightenment and EFL Developer Documentation 
+
+Enlightenment has developed from a window manager into a set of libraries
+that support a large number of exciting applications.
+Aimed primarily at slick graphical presentation and optimal runtime we
+created the Enlightenment Foundation Libraries and have created the following
+documentation to help everyone get involved - thanks for stopping by.
+
+
+
+Getting Started
 
 If you are going to use EFL, we encourage you to actually work with
 EFL from [[http://git.enlightenment.org|git]] mostly because it allows
@@ -26,49 +36,70 @@ course you can use stable packages for your distribution as 
well.
 Go check the current available version of EFL on each distro/platform:
 [[https://phab.enlightenment.org/w/packaging_status/|Table of current version 
of EFL]]
 
-=== Feedback ===
+=== Working with Code ===
 
-  * [[debugging/report_bugs|Report bugs on Phabricator]]
-  * [[contact/arcanist|Submit patch on Phabricator]]
+  * [[docs/c/start|A basic primer on C]]
 
-=== Working with EFL and Code ===
 
-  * [[docs/c/start|A basic primer on C]]
+
+
+EFL Documentation
+
+The EFL is currently undergoing a significant redesign to give a better
+developer experience when building apps using our platform.
+For now we recommend using the stable API and it's Bindings.
+
+=== Working with EFL ===
+
   * [[docs/efl/start|Get started with EFL]]
-  * [[docs-efl-debug|Debugging (generic) - EFL and Enlightenment]]
   * [[docs/efl/advanced/start|Advanced EFL Topics]]
 
-=== Themes / Edje / EDC ===
+=== Stable API ===
 
-A core part of Enlightenment and EFL is the design/theme abstraction layer. 
This is handled by the Edje library and a series of tools that can 
compile/package up theme files and compress them, decompile them, and even 
provide some GUI editors too.
+  * [[http://docs.enlightenment.org/efl/current|C (our main language)]]
+  * [[http://docs.enlightenment.org/python-efl/current|Python Bindings]]
 
-  * [[about-eflete|Eflete]] - GUI Theme design tool
-  * [[about-enventor|Enventor]] GUI Edje file design tool
-  * [[themes/start|Getting started]] with Edje and themes at the EDC file level
-  * [[themes/knob_example|Edje theme example]] A knob theme for the Elementary 
slider widget
+=== Beta API using EO ===
+
+  * [[docs/efl/auto/reference|EFL EO API documentation (C)]]
+
+
+
+
+Contributing
+
+We are really excited that you would like to get involved in EFL and
+Enlightenment development! If you followed the instructions in
+"Getting Started" then you are most of the way to being part of the team.
+To start with it's easiest to see which area you would like to work on and
+get involved in bug reporting or fixing. From there you can get to know the
+team, how we work, and earn a place on the team as a core developer :)
+
+=== Feedback ===
+
+  * [[debugging/report_bugs|Report bugs on Phabricator]]
+  * [[contact/arcanist|Submit patch on Phabricator]]
 
 === Debugging ===
 
+  * [[docs-efl-debug|Debugging (generic) - EFL and Enlightenment]]
   * [[debugging/enlightenment_debugging|Enlightenment specific debugging]]
   * [[debugging/apps_efl_debugging|EFL application debugging]]
   * [[debugging/remote_debugging|Remote Debugging]]
 
-=== Tutorials ===
 
-  * [[tutorial/basic_tutorial|Basic Tutorial]]
-  * [[tutorial/genlist_tutorial|Genlist Tutorial]]
-  * [[tutorial/panes_tutorial|Panes Tutorial]]
-  * [[tutorial/form_tutorial|Form Tutorial]]
-  * [[tutorial/menu_tutorial|Menu Tutorial]]
-  * [[tutorial/naviframe_tutorial|Naviframe Tutorial]]
-  * [[tutorial/popup_tutorial|Popup Tutorial]]
-  * [[tutorial/gl_2d_tutorial|GL 2D Tutorial]]
-  * [[tutorial/preference_tutorial|Preference Tutorial]]
-  * [[tutorial/effects_tutorial|Effects Tutorial]]
-  * [[tutorial/multimedia_tutorial|Multimedia Tutorial]]
-  * [[tutorial/javascript_tutorial|JavaScript Tutorial]]
+
 
-=== Programming Guide ===
+That's it for the basics - hopefully you are now up and running with
+the EFL (and perhaps Enlightenment too!) and looking to learn more.
+Here is a collection of guides and tutorials to help you get deeper into

[EGIT] [core/efl] master 02/02: elm_code: add missing selection signals

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=665679bc423ee81cf97fe26b30560bb611e9deba

commit 665679bc423ee81cf97fe26b30560bb611e9deba
Author: Andy Williams 
Date:   Sat Jul 15 21:29:33 2017 +0100

elm_code: add missing selection signals
---
 src/lib/elementary/elm_code_widget.eo  | 3 +++
 src/lib/elementary/elm_code_widget_selection.c | 5 +
 2 files changed, 8 insertions(+)

diff --git a/src/lib/elementary/elm_code_widget.eo 
b/src/lib/elementary/elm_code_widget.eo
index 6cc219fd07..c61277b4ac 100644
--- a/src/lib/elementary/elm_code_widget.eo
+++ b/src/lib/elementary/elm_code_widget.eo
@@ -315,5 +315,8 @@ class Elm.Code_Widget (Elm.Layout, Elm.Interface.Atspi.Text)
   selection,start; [[Called when a selection is started]]
   selection,changed; [[Called when selection changed]]
   selection,cleared; [[Called when selection was cleared]]
+  selection,cut; [[Called when a cut action is performed]]
+  selection,copy; [[Called when a copy action is performed]]
+  selection,paste; [[Called when a paste action is performed]]
}
 }
diff --git a/src/lib/elementary/elm_code_widget_selection.c 
b/src/lib/elementary/elm_code_widget_selection.c
index 5c5c1b7dbc..a510cde5bf 100644
--- a/src/lib/elementary/elm_code_widget_selection.c
+++ b/src/lib/elementary/elm_code_widget_selection.c
@@ -399,6 +399,7 @@ elm_code_widget_selection_cut(Evas_Object *widget)
 
elm_code_widget_selection_delete(widget);
 
+   efl_event_callback_legacy_call(widget, 
ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_CUT, widget);
efl_event_callback_legacy_call(widget, 
ELM_OBJ_CODE_WIDGET_EVENT_CHANGED_USER, NULL);
 }
 
@@ -414,6 +415,8 @@ elm_code_widget_selection_copy(Evas_Object *widget)
elm_cnp_selection_set(widget, ELM_SEL_TYPE_CLIPBOARD, ELM_SEL_FORMAT_TEXT, 
text, strlen(text));
elm_cnp_selection_loss_callback_set(widget, ELM_SEL_TYPE_CLIPBOARD, 
_selection_loss_cb, widget);
free(text);
+
+   efl_event_callback_legacy_call(widget, 
ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_COPY, widget);
 }
 
 static Eina_Bool
@@ -424,6 +427,8 @@ _selection_paste_cb(void *data, Evas_Object *obj 
EINA_UNUSED, Elm_Selection_Data
widget = (Elm_Code_Widget *)data;
 
elm_code_widget_text_at_cursor_insert(widget, ev->data);
+
+   efl_event_callback_legacy_call(widget, 
ELM_OBJ_CODE_WIDGET_EVENT_SELECTION_PASTE, widget);
return EINA_TRUE;
 }
 

-- 

[EGIT] [core/efl] master 01/02: build: set tests according to profile by default

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=f5449dafd320838e788667b4c71441caa919946b

commit f5449dafd320838e788667b4c71441caa919946b
Author: Andy Williams 
Date:   Sat Jul 15 20:00:01 2017 +0100

build: set tests according to profile by default
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b90328ec2f..654f1f0d3c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -120,7 +120,7 @@ esac
 
 AC_ARG_WITH([tests],
[AS_HELP_STRING([--with-tests=none|regular|coverage],[choose testing 
method: regular, coverage or none.
-@<:@default=none@:>@])],
+@<:@default=auto@:>@])],
[build_tests=${withval}],
[build_tests=auto])
 

-- 

[EGIT] [website/www] master 01/01: Work with the bav bar on mobile layout so we don't waste space

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=188fbe7982fc528e38669192ed6dcb9c839ceb11

commit 188fbe7982fc528e38669192ed6dcb9c839ceb11
Author: Andy Williams 
Date:   Sat Jul 15 11:13:53 2017 +0100

Work with the bav bar on mobile layout so we don't waste space
---
 public_html/lib/tpl/e/css/modifications.css | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/public_html/lib/tpl/e/css/modifications.css 
b/public_html/lib/tpl/e/css/modifications.css
index 2a300de..059f2d2 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -710,12 +710,12 @@ table {
 @media screen and (max-width: 768px) {
/* If we are trying to launch kiwi-irc on mobile use the whole window... */
#ircbubble {
-  top: 0;
+  top: 46px;
   left: 0;
   bottom: 0;
   right: 0;
   width: 100%;
-  height: 100%;
+  height: auto;
   z-index: 100;
}
 
@@ -723,5 +723,12 @@ table {
   width: 100% !important;
   height: 100% !important;
}
+
+   #ircbutton {
+  top: -20px;
+  bottom: auto;
+  right: 40px;
+  transform: scale(0.5);
+   }
 }
 

-- 

[EGIT] [website/www] master 03/03: If we launch kiwiirc on a small device then fill the screen

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=f915039719c8c5454e8eba7189ea293b961c28bf

commit f915039719c8c5454e8eba7189ea293b961c28bf
Author: Andy Williams 
Date:   Sat Jul 15 11:04:27 2017 +0100

If we launch kiwiirc on a small device then fill the screen
---
 public_html/lib/tpl/e/css/modifications.css | 19 +++
 1 file changed, 19 insertions(+)

diff --git a/public_html/lib/tpl/e/css/modifications.css 
b/public_html/lib/tpl/e/css/modifications.css
index 9cc7377..2a300de 100644
--- a/public_html/lib/tpl/e/css/modifications.css
+++ b/public_html/lib/tpl/e/css/modifications.css
@@ -706,3 +706,22 @@ table {
width: 60px;
height: 60px;
 }
+
+@media screen and (max-width: 768px) {
+   /* If we are trying to launch kiwi-irc on mobile use the whole window... */
+   #ircbubble {
+  top: 0;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 100;
+   }
+
+   #ircbubble iframe {
+  width: 100% !important;
+  height: 100% !important;
+   }
+}
+

-- 

[EGIT] [website/www] master 01/03: Add column plugin and re-flow columns on mobile

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=62069b6490d113a6c8a179a364f92f8ebc5040a4

commit 62069b6490d113a6c8a179a364f92f8ebc5040a4
Author: Andy Williams 
Date:   Sat Jul 15 10:53:16 2017 +0100

Add column plugin and re-flow columns on mobile
---
 public_html/lib/plugins/columns/action.php | 675 +
 public_html/lib/plugins/columns/conf/default.php   |  12 +
 public_html/lib/plugins/columns/conf/metadata.php  |  12 +
 public_html/lib/plugins/columns/lang/en/lang.php   |  12 +
 .../lib/plugins/columns/lang/en/settings.php   |  12 +
 public_html/lib/plugins/columns/lang/es/lang.php   |  12 +
 .../lib/plugins/columns/lang/es/settings.php   |  12 +
 public_html/lib/plugins/columns/lang/ru/lang.php   |  12 +
 .../lib/plugins/columns/lang/ru/settings.php   |  12 +
 public_html/lib/plugins/columns/plugin.info.txt|   7 +
 public_html/lib/plugins/columns/print.css  |  24 +
 public_html/lib/plugins/columns/rewriter.php   | 190 ++
 public_html/lib/plugins/columns/style.css  |  43 ++
 public_html/lib/plugins/columns/syntax.php | 611 +++
 public_html/lib/tpl/e/css/modifications.css|  11 +
 15 files changed, 1657 insertions(+)

diff --git a/public_html/lib/plugins/columns/action.php 
b/public_html/lib/plugins/columns/action.php
new file mode 100644
index 000..c96e54b
--- /dev/null
+++ b/public_html/lib/plugins/columns/action.php
@@ -0,0 +1,675 @@
+http://www.gnu.org/licenses/gpl.html)
+ * @author Mykola Ostrovskyy 
+ */
+
+/* Must be run within Dokuwiki */
+if(!defined('DOKU_INC')) die();
+
+if(!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
+require_once(DOKU_PLUGIN . 'action.php');
+require_once(DOKU_PLUGIN . 'columns/rewriter.php');
+
+class action_plugin_columns extends DokuWiki_Action_Plugin {
+
+private $block;
+private $currentBlock;
+private $currentSectionLevel;
+private $sectionEdit;
+
+/**
+ * Register callbacks
+ */
+public function register(Doku_Event_Handler $controller) {
+$controller->register_hook('PARSER_HANDLER_DONE', 'AFTER', $this, 
'handle');
+}
+
+/**
+ *
+ */
+public function handle(&$event, $param) {
+$this->reset();
+$this->buildLayout($event);
+$rewriter = new instruction_rewriter();
+foreach ($this->block as $block) {
+$block->processAttributes($event);
+$rewriter->addCorrections($block->getCorrections());
+}
+$rewriter->process($event->data->calls);
+}
+
+/**
+ * Find all columns instructions and construct columns layout based on them
+ */
+private function buildLayout(&$event) {
+$calls = count($event->data->calls);
+for ($c = 0; $c < $calls; $c++) {
+$call =& $event->data->calls[$c];
+switch ($call[0]) {
+case 'section_open':
+$this->currentSectionLevel = $call[1][0];
+$this->currentBlock->openSection();
+break;
+
+case 'section_close':
+$this->currentBlock->closeSection($c);
+break;
+
+case 'plugin':
+if ($call[1][0] == 'columns') {
+$this->handleColumns($c, $call[1][1][0], 
$this->detectSectionEdit($event->data->calls, $c));
+}
+break;
+}
+}
+}
+
+/**
+ * Reset internal state
+ */
+private function reset() {
+$this->block = array();
+$this->block[0] = new columns_root_block();
+$this->currentBlock = $this->block[0];
+$this->currentSectionLevel = 0;
+$this->sectionEdit = array();
+}
+
+/**
+ *
+ */
+private function detectSectionEdit($call, $start) {
+$result = null;
+$calls = count($call);
+for ($c = $start + 1; $c < $calls; $c++) {
+switch ($call[$c][0]) {
+case 'section_close':
+case 'p_open':
+case 'p_close':
+/* Skip these instructions */
+break;
+
+case 'header':
+if (end($this->sectionEdit) != $c) {
+$this->sectionEdit[] = $c;
+$result = $call[$c][2];
+}
+break 2;
+
+case 'plugin':
+if ($call[$c][1][0] == 'columns') {
+break;
+} else {
+   

[EGIT] [website/www] master 02/03: Fix PHP header to be more compatible

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www.git/commit/?id=150e77b0ce51a6bca9c32547801771ef3afb3850

commit 150e77b0ce51a6bca9c32547801771ef3afb3850
Author: Andy Williams 
Date:   Sat Jul 15 10:53:52 2017 +0100

Fix PHP header to be more compatible
---
 public_html/lib/plugins/const/class.evalmath.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public_html/lib/plugins/const/class.evalmath.php 
b/public_html/lib/plugins/const/class.evalmath.php
index bb765ce..841a227 100644
--- a/public_html/lib/plugins/const/class.evalmath.php
+++ b/public_html/lib/plugins/const/class.evalmath.php
@@ -1,4 +1,4 @@
-

[EGIT] [core/efl] master 01/01: doc: Include two missing properties

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=77adf813d5cf75ac4ffbf5a715d11f5b4f9ae10e

commit 77adf813d5cf75ac4ffbf5a715d11f5b4f9ae10e
Author: Andy Williams 
Date:   Thu Jul 13 23:19:52 2017 +0100

doc: Include two missing properties
---
 src/lib/evas/Evas_Legacy.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/evas/Evas_Legacy.h b/src/lib/evas/Evas_Legacy.h
index 64dd28f56d..c726a18380 100644
--- a/src/lib/evas/Evas_Legacy.h
+++ b/src/lib/evas/Evas_Legacy.h
@@ -225,8 +225,8 @@ struct _Evas_Event_Mouse_Move /** Mouse move event */
 
 struct _Evas_Event_Mouse_Wheel /** Wheel event */
 {
-   int  direction; /* 0 = default up/down wheel FIXME: more wheel 
types */
-   int  z; /* ...,-2,-1 = down, 1,2,... = up */
+   int  direction; /**< Axis of screen wheel - 0 = default up/down 
wheel, 1 = horizontal left/right wheel */
+   int  z; /**< The step for the wheel movement relative to the 
direction above...,-2,-1 = down, 1,2,... = up */
 
Evas_Pointoutput; /**< The X/Y location of the cursor */
Evas_Coord_Point  canvas; /**< The X/Y location of the cursor */

-- 

[EGIT] [tools/edi] master 02/02: Update news file with recent changes

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=e0b97f680ce8a6268b82d5c58cf48fb1bf4d2cad

commit e0b97f680ce8a6268b82d5c58cf48fb1bf4d2cad
Author: Andy Williams 
Date:   Fri Jul 7 03:16:55 2017 +0100

Update news file with recent changes
---
 NEWS | 7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 5c7762b..03a9661 100644
--- a/NEWS
+++ b/NEWS
@@ -6,8 +6,13 @@ Features:
 
   * Integrate GDB debugger console
   * Add snippet support to the code editor
-  * Add SCM support (just git right now)
+  * Add SCM support (git)
+  * Add rust language and clang build support
+  * Highlight all search results
 
+Bug fixes:
+
+  * Fix issue where large projects could cause slow starts 
 
 -
 Edi 0.5.1

-- 

[EGIT] [tools/edi] master 01/02: tests: we removed c++ syntax - don't test for it

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=ad09746452b83c3305019585fab2498c575cd7f3

commit ad09746452b83c3305019585fab2498c575cd7f3
Author: Andy Williams 
Date:   Fri Jul 7 03:16:43 2017 +0100

tests: we removed c++ syntax - don't test for it
---
 src/tests/edi_test_content_provider.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/tests/edi_test_content_provider.c 
b/src/tests/edi_test_content_provider.c
index 1b1c6f0..d2610d2 100644
--- a/src/tests/edi_test_content_provider.c
+++ b/src/tests/edi_test_content_provider.c
@@ -70,20 +70,20 @@ START_TEST (edi_test_content_provider_c_files)
_edi_test_content_provider_type_assert("text/x-chdr", "code");
 }
 END_TEST
-
+/*
 START_TEST (edi_test_content_provider_cpp_files)
 {
_edi_test_content_provider_type_assert("text/x-c++src", "code");
_edi_test_content_provider_type_assert("text/x-c++hdr", "code");
 }
 END_TEST
-
+*/
 void edi_test_content_provider(TCase *tc)
 {
tcase_add_test(tc, edi_test_content_provider_id_lookup);
tcase_add_test(tc, edi_test_content_provider_mime_lookup);
tcase_add_test(tc, edi_test_content_provider_text_files);
tcase_add_test(tc, edi_test_content_provider_c_files);
-   tcase_add_test(tc, edi_test_content_provider_cpp_files);
+//   tcase_add_test(tc, edi_test_content_provider_cpp_files);
 }
 

-- 

[EGIT] [website/www-content] master 01/02: Update to reflect that a new EDD occurred

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=4201182c309649ba74e1196e43589e285e026d9b

commit 4201182c309649ba74e1196e43589e285e026d9b
Author: Andy Williams 
Date:   Fri Jul 7 03:14:58 2017 +0100

Update to reflect that a new EDD occurred
---
 pages/start.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/start.txt b/pages/start.txt
index 07cf1b11..d98309d3 100644
--- a/pages/start.txt
+++ b/pages/start.txt
@@ -10,7 +10,7 @@
 
 {{  :shot-enlightenment.png?nolink&320}}
 
-[[:about-enlightenment|Enlightenment]] started as a project to build a Window 
Manager for X11. That was way back in 1996. It has grown much since. It still 
produces this Window Manager, but it has evolved to also cover Mobile, Wearable 
and TV UI needs for projects such as [[http://www.tizen.org|Tizen]] as well as 
traditional the "desktop" UI. We still push out releases, so see our 
[[:download|download]] page for more details on the latest releases, or see our 
[[:contribute|contribute]] p [...]
+[[:about-enlightenment|Enlightenment]] started as a project to build a Window 
Manager for X11. That was way back in 1996. It has grown much since. It still 
produces this Window Manager, but it has evolved to also cover Mobile, Wearable 
and TV UI needs for projects such as [[http://www.tizen.org|Tizen]] as well as 
the traditional "desktop" UI. We still push out releases, so see our 
[[:download|download]] page for more details on the latest releases, or see our 
[[:contribute|contribute]] p [...]
 
 It also is in the transition from [[http://www.x.org|X11]] to 
[[http://wayland.freedesktop.org|Wayland]]. We are fully committed to moving to 
Wayland eventually as this is definitely the future of the graphical display 
layer on Linux.
 
@@ -64,7 +64,7 @@ Our DNS is provided kindly by 
[[https://www.easydns.com/|EasyDNS]].
 
 Our SSL certificates are provided by [[https://www.gandi.net|Gandi.net]].
 
-Many of our **Enlightenment Developer Days** events have been sponsored and 
paid for by [[https://www.samsung.com|Samsung]], and the most recent was hosted 
by [[https://openwide.fr|Openwide]] in Paris.
+Many of our **Enlightenment Developer Days** events have been sponsored and 
paid for by [[https://www.samsung.com|Samsung]], and recently hosted by 
[[https://openwide.fr|Openwide]].
 
 [[https://flattr.com/thing/418692/Enlightenment|{{:thanks-flattr.svg|Flattr}}]]
 
[[https://www.paypal.com/webscr?cmd=_s-xclick&hosted_button_id=A5U75JR3FFWFC|{{:thanks-paypal.svg|PayPal}}]]

-- 

[EGIT] [website/www-content] master 02/02: edi: Update screens and about info

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/www-content.git/commit/?id=f0dc3a0711de015f5565ab1f1f07315446187dbc

commit f0dc3a0711de015f5565ab1f1f07315446187dbc
Author: Andy Williams 
Date:   Fri Jul 7 03:15:12 2017 +0100

edi: Update screens and about info
---
 media/edi-screen2.jpg | Bin 464907 -> 276692 bytes
 media/shot-edi.png| Bin 93988 -> 84487 bytes
 pages/about-edi.txt   |  24 +---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/media/edi-screen2.jpg b/media/edi-screen2.jpg
index 1a939fa9..a984c5f4 100644
Binary files a/media/edi-screen2.jpg and b/media/edi-screen2.jpg differ
diff --git a/media/shot-edi.png b/media/shot-edi.png
index 48ad3d70..421a704e 100644
Binary files a/media/shot-edi.png and b/media/shot-edi.png differ
diff --git a/pages/about-edi.txt b/pages/about-edi.txt
index e074d028..1345ac9d 100644
--- a/pages/about-edi.txt
+++ b/pages/about-edi.txt
@@ -1,11 +1,11 @@
-~~Title: About EDI~~
- EDI (The Enlightenment IDE) 
+~~Title: About Edi~~
+ Edi (The Enlightenment IDE) 
 
-[[https://github.com/ajwillia-ms/edi/releases|Download EDI pre-release here]]
+[[https://github.com/ajwillia-ms/edi/releases|Download Edi pre-release here]]
 
 {{:edi-logo.png?nolink |}}
 
-EDI is a development environment designed for and built using the EFL.
+Edi is a development environment designed for and built using the EFL.
 Our aim is to create a new, native development environment for Linux that 
makes getting up and running easier than ever before. With so much happening on 
Linux both on the desktop and on mobile we want to help more developers get 
involved in the exciting future of open source development.
 
 
@@ -25,20 +25,14 @@ phases. We have completed "Basic text editing" and are 
working on
 
 So far the main features include:
 
-  * Editing and saving text files
+  * Syntax highlighting
+  * Auto suggestion for C files and headers
   * Tabbed browsing of open files
-  * Opening editor in a new window
-  * Displaying directory for the project (directory)
-  * Link files out to external viewers / editors
-  * No screen waste (toolbar, menu, tab are out of the way of the developer)
-  * Info panel with logs and useful output
-  * Create new file
-  * Simple build functions
+  * Build management and test runner
   * Search & replace in file
-  * Line numbers & go to line
+  * Displaying file browser for the project (directory)
+  * No screen waste (toolbar, menu, tab are out of the way of the developer)
   * Creation of new projects from name input and skeleton project files
-  * Syntax highlighting
-  * Diff rendering
 
 If you have ideas for features please let us know in the #edi-ide room on 
irc.freenode.net.
 

-- 

[EGIT] [core/efl] master 01/02: elm_code: Fix rust syntax to include types

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=961c173f0ffd428a831327933a72084bdb1355ec

commit 961c173f0ffd428a831327933a72084bdb1355ec
Author: Andy Williams 
Date:   Thu Jul 6 17:18:47 2017 +0100

elm_code: Fix rust syntax to include types
---
 src/lib/elementary/elm_code_syntax.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/lib/elementary/elm_code_syntax.c 
b/src/lib/elementary/elm_code_syntax.c
index 27b460b7c1..e400b511f0 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -38,7 +38,8 @@ static Elm_Code_Syntax _elm_code_syntax_rust =
NULL,
{"as", "break", "const", "continue", "create", "else",  "enum", "extern", 
"false", "fn", "for", "if", \
   "impl", "in", "let", "loop", "match", "mod", "move", "mut", "pub", 
"ref", "return", "Self", "self", \
-  "static", "struct", "super", "trait", "true", "type", "unsafe", "use", 
"where", "while", NULL}
+  "static", "struct", "super", "trait", "true", "type", "unsafe", "use", 
"where", "while",
+  "bool", "i8", "i16", "i32", "i64", "isize", "u8", "u16", "u32", "u64", 
"usize", "f32", "f64", "char", NULL}
 };
 
 static Elm_Code_Syntax _elm_code_syntax_py =

-- 

[EGIT] [core/efl] master 02/02: elm_code: Fix number parsing to include legal separators

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=ada147da71ea981385b89a3ccfa6e696a72dba99

commit ada147da71ea981385b89a3ccfa6e696a72dba99
Author: Andy Williams 
Date:   Thu Jul 6 17:19:14 2017 +0100

elm_code: Fix number parsing to include legal separators

This also allows rust to use underscore!
@fix
---
 src/lib/elementary/elm_code_syntax.c | 24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/lib/elementary/elm_code_syntax.c 
b/src/lib/elementary/elm_code_syntax.c
index e400b511f0..45647cacea 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -10,6 +10,7 @@
 typedef struct _Elm_Code_Syntax
 {
const char *symbols;
+   const char *numparts;
const char *preprocessor;
const char *comment_single;
const char *comment_start;
@@ -20,6 +21,7 @@ typedef struct _Elm_Code_Syntax
 static Elm_Code_Syntax _elm_code_syntax_c =
 {
"{}()[]:;%^/*+&|~!=<->,.",
+   ".",
"#",
"//",
"/*",
@@ -32,6 +34,7 @@ static Elm_Code_Syntax _elm_code_syntax_c =
 static Elm_Code_Syntax _elm_code_syntax_rust =
 {
"-*!&+/%|^<=>:;.,{}()[]",
+   "._",
"#",
"//",
NULL,
@@ -45,6 +48,7 @@ static Elm_Code_Syntax _elm_code_syntax_rust =
 static Elm_Code_Syntax _elm_code_syntax_py =
 {
"{}()[]:;%/*+!=<->,.",
+   ".",
NULL,
"#",
"\"\"\"",
@@ -58,6 +62,7 @@ static Elm_Code_Syntax _elm_code_syntax_py =
 static Elm_Code_Syntax _elm_code_syntax_eo =
 {
"{}():;*,.",
+   ".",
NULL,
"//",
"[[",
@@ -93,13 +98,28 @@ elm_code_syntax_for_mime_get(const char *mime)
return NULL;
 }
 
+static Eina_Bool
+_char_is_number(char c, Elm_Code_Syntax *syntax)
+{
+   const char *sym;
+
+   if (isdigit(c))
+ return EINA_TRUE;
+
+   for (sym = syntax->numparts; *sym; sym++)
+ if (c == *sym)
+   return EINA_TRUE;
+
+   return EINA_FALSE;
+}
+
 static void
 _elm_code_syntax_parse_token(Elm_Code_Syntax *syntax, Elm_Code_Line *line, 
unsigned int pos, const char *token, unsigned int length)
 {
const char **keyword;
unsigned int i;
 
-  for (keyword = syntax->keywords; *keyword; keyword++)
+   for (keyword = syntax->keywords; *keyword; keyword++)
  if (strlen(*keyword) == length && !strncmp(token, *keyword, length))
{
   elm_code_line_token_add(line, pos, pos + length - 1, 1, 
ELM_CODE_TOKEN_TYPE_KEYWORD);
@@ -108,7 +128,7 @@ _elm_code_syntax_parse_token(Elm_Code_Syntax *syntax, 
Elm_Code_Line *line, unsig
 
for (i = 0; i < length; i++)
  {
-if (!isdigit(token[i]))
+if (!_char_is_number(token[i], syntax))
   break;
 if (i == length - 1)
   elm_code_line_token_add(line, pos, pos + length - 1, 1, 
ELM_CODE_TOKEN_TYPE_NUMBER);

-- 

[EGIT] [tools/edi] master 01/04: build: Add support for cargo based rust projects

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=405f93efe1f8cbdb0f30394198bf7bd629b74d63

commit 405f93efe1f8cbdb0f30394198bf7bd629b74d63
Author: Andy Williams 
Date:   Tue Jul 4 14:10:55 2017 +0100

build: Add support for cargo based rust projects

In the process we needed to define if a project can be run...
Python and rust can always be run as they will build their binaries
whereas make and cmake need to be configured etc...
---
 src/bin/Makefile.am|  3 +-
 src/bin/edi_content_provider.c | 14 +++---
 src/bin/edi_main.c | 38 +-
 src/bin/language/edi_language_provider.c   | 20 ++--
 src/bin/language/edi_language_provider.h   | 11 
 src/bin/language/edi_language_provider_rust.c  | 58 ++
 src/lib/Makefile.am|  1 +
 src/lib/edi_build_provider.c   |  5 ++
 src/lib/edi_build_provider.h   |  2 +
 ...rovider_python.c => edi_build_provider_cargo.c} | 49 +++---
 src/lib/edi_build_provider_cmake.c | 43 +++-
 src/lib/edi_build_provider_make.c  | 43 +++-
 src/lib/edi_build_provider_python.c| 15 ++
 src/lib/edi_builder.c  | 22 
 src/lib/edi_builder.h  | 23 +
 15 files changed, 290 insertions(+), 57 deletions(-)

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index c159a8c..17a3a36 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -62,7 +62,8 @@ edi_main.c \
 edi_private.h
 
 EXTRA_DIST = \
-language/edi_language_provider_c.c
+language/edi_language_provider_c.c \
+language/edi_language_provider_rust.c
 
 edi_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la $(LTLIBINTL)
 
diff --git a/src/bin/edi_content_provider.c b/src/bin/edi_content_provider.c
index d0e0a0a..56a83aa 100644
--- a/src/bin/edi_content_provider.c
+++ b/src/bin/edi_content_provider.c
@@ -10,6 +10,8 @@
 
 #include "edi_config.h"
 
+#include "language/edi_language_provider.h"
+
 #include "edi_private.h"
 
 // TODO move out to edi_content.c or similar just like the editor type
@@ -72,17 +74,17 @@ static Edi_Content_Provider 
_edi_content_provider_registry[] =
 Edi_Content_Provider *edi_content_provider_for_mime_get(const char *mime)
 {
const char *id = NULL;
+   Edi_Language_Provider *provider;
 
if (!mime)
  return NULL;
 
-   if (!strcasecmp(mime, "text/plain") || !strcasecmp(mime, 
"application/x-shellscript"))
- id = "text";
-   else if (!strcasecmp(mime, "text/x-chdr") || !strcasecmp(mime, 
"text/x-csrc")
-|| !strcasecmp(mime, "text/x-modelica"))
- id = "code";
-   else if (!strcasecmp(mime, "text/x-c++src") || !strcasecmp(mime, 
"text/x-c++hdr"))
+   provider = edi_language_provider_for_mime_get(mime);
+
+   if (!!provider)
  id = "code";
+   else if (!strcasecmp(mime, "text/plain") || !strcasecmp(mime, 
"application/x-shellscript"))
+ id = "text";
else if (!strncasecmp(mime, "image/", 6))
  id = "image";
else if (!strcasecmp(mime, "text/x-diff") || !strcasecmp(mime, 
"text/x-patch"))
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 68c0073..6294b85 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -601,32 +601,6 @@ edi_launcher_config_missing()
 }
 
 static void
-_edi_launcher_run(Edi_Project_Config_Launch *launch)
-{
-   char *full_cmd;
-   int full_len;
-
-   if (!_edi_project_config->launch.path)
- {
-edi_launcher_config_missing();
-return;
- }
-
-   if (!_edi_project_config->launch.args)
- {
-ecore_exe_run(launch->path, NULL);
-return;
- }
-
-   full_len = strlen(_edi_project_config->launch.path) + 
strlen(_edi_project_config->launch.path);
-   full_cmd = malloc(sizeof(char) * (full_len + 1));
-   snprintf(full_cmd, full_len + 2, "%s %s", _edi_project_config->launch.path, 
_edi_project_config->launch.args);
-   ecore_exe_run(full_cmd, NULL);
-
-   free(full_cmd);
-}
-
-static void
 _edi_project_credentials_missing()
 
 {
@@ -758,6 +732,18 @@ _edi_build_prep(Evas_Object *button)
 }
 
 static void
+_edi_launcher_run(Edi_Project_Config_Launch *launch)
+{
+   if (!edi_builder_can_run(_edi_project_config->launch.path))
+ {
+edi_launcher_config_missing();
+return;
+ }
+
+   edi_builder_run(launch->path, launch->args);
+}
+
+static void
 _tb_build_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info 
EINA_UNUSED)
 {
if (_edi_build_prep(obj))
diff --git a/src/bin/language/ed

[EGIT] [tools/edi] master 02/04: ui: Remove duplicate code from menu fix

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=ee5bb1a4a7935bab505ecc6db3ba0731453943d7

commit ee5bb1a4a7935bab505ecc6db3ba0731453943d7
Author: Andy Williams 
Date:   Wed Jul 5 21:04:38 2017 +0100

ui: Remove duplicate code from menu fix
---
 src/bin/edi_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 6294b85..2eea806 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -1065,7 +1065,7 @@ _edi_menu_about_cb(void *data EINA_UNUSED, Evas_Object 
*obj EINA_UNUSED,
 static void
 _edi_menu_setup(Evas_Object *win)
 {
-   Evas_Object *menu = elm_win_main_menu_get(win);
+   Evas_Object *menu;
Elm_Object_Item *menu_it;
static Eina_Bool setup = EINA_FALSE;
 
@@ -1345,8 +1345,6 @@ edi_open(const char *inputpath)
if (!win) return EINA_FALSE;
 
_edi_main_win = win;
-   _edi_menu_setup(win);
-
elm_win_focus_highlight_enabled_set(win, EINA_TRUE);
evas_object_smart_callback_add(win, "delete,request", _edi_exit, NULL);
evas_object_event_callback_add(win, EVAS_CALLBACK_RESIZE, _edi_resize_cb, 
NULL);

-- 

[EGIT] [tools/edi] master 04/04: search: Reset search highlights on cancel

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=ddce7ca44875b7d05fe01cd198da915c2c364479

commit ddce7ca44875b7d05fe01cd198da915c2c364479
Author: Andy Williams 
Date:   Wed Jul 5 22:02:38 2017 +0100

search: Reset search highlights on cancel

Also fix the highlighting of all matches on a line
---
 src/bin/editor/edi_editor_search.c | 56 +++---
 1 file changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/bin/editor/edi_editor_search.c 
b/src/bin/editor/edi_editor_search.c
index ea057a5..a3df473 100644
--- a/src/bin/editor/edi_editor_search.c
+++ b/src/bin/editor/edi_editor_search.c
@@ -96,14 +96,45 @@ _edi_search_cache_use(Edi_Editor_Search *search, char 
**text, Elm_Code_Line **li
search->current_search_col = search->first_result.column;
 }
 
+
+static Eina_List *
+_edi_search_clear_highlights(Eina_List *tokens)
+{
+   Elm_Code_Token *token;
+   Eina_List *ret, *item, *item_next;
+
+   ret = tokens;
+
+   EINA_LIST_FOREACH_SAFE(tokens, item, item_next, token)
+ {
+if (token->type == ELM_CODE_TOKEN_TYPE_MATCH)
+  ret = eina_list_remove(ret, token);
+ }
+
+   return ret;
+}
+
+static void
+_edi_search_show_highlights(Elm_Code_Line *line, const char *text)
+{
+   int match;
+
+   match = elm_code_line_text_strpos(line, text, 0);
+   while (match != ELM_CODE_TEXT_NOT_FOUND)
+ {
+elm_code_line_token_add(line, match, match + strlen(text) - 1, 1, 
ELM_CODE_TOKEN_TYPE_MATCH);
+
+match = elm_code_line_text_strpos(line, text, match + 1);
+ }
+}
+
 static Eina_Bool
 _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
 {
Eina_Bool try_next = EINA_FALSE;
-   Eina_List *item, *subitem, *subitem_next;
+   Eina_List *item;
Elm_Code *code;
Elm_Code_Line *line;
-   Elm_Code_Token *token;
const char *text_markup;
char *text;
unsigned int offset, pos, pos_line, pos_col;
@@ -136,19 +167,15 @@ _edi_search_in_entry(Evas_Object *entry, 
Edi_Editor_Search *search)
found = ELM_CODE_TEXT_NOT_FOUND;
EINA_LIST_FOREACH(code->file->lines, item, line)
  {
-EINA_LIST_FOREACH_SAFE(line->tokens, subitem, subitem_next, token)
-  {
- if (token->type == ELM_CODE_TOKEN_TYPE_MATCH)
-   line->tokens = eina_list_remove(line->tokens, token);
-  }
+line->tokens = _edi_search_clear_highlights(line->tokens);
+_edi_search_show_highlights(line, text);
+
 offset = 0;
 match = elm_code_line_text_strpos(line, text, offset);
 if (match == ELM_CODE_TEXT_NOT_FOUND)
   continue;
 
-elm_code_line_token_add(line, match, match + strlen(text) - 1, 1, 
ELM_CODE_TOKEN_TYPE_MATCH);
 pos = elm_code_widget_line_text_column_width_to_position(entry, line, 
match);
-
 if (!_edi_search_cache_exists(search))
   _edi_search_cache_store(search, match, text, line, pos);
 
@@ -163,7 +190,7 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search 
*search)
  if (match == ELM_CODE_TEXT_NOT_FOUND)
continue;
 
- elm_code_line_token_add(line, match, match + strlen(text) - 1, 1, 
ELM_CODE_TOKEN_TYPE_MATCH);
+ pos = elm_code_widget_line_text_column_width_to_position(entry, 
line, match);
   }
 
 if (found == ELM_CODE_TEXT_NOT_FOUND)
@@ -270,6 +297,9 @@ static void
 _edi_editor_search_hide(Edi_Editor *editor)
 {
Edi_Editor_Search *search;
+   Elm_Code *code;
+   Elm_Code_Line *line;
+   Eina_List *item;
 
search = editor->search;
if (!search)
@@ -282,6 +312,12 @@ _edi_editor_search_hide(Edi_Editor *editor)
 elm_box_unpack(search->parent, search->widget);
  }
 
+   code = elm_code_widget_code_get(editor->entry);
+   EINA_LIST_FOREACH(code->file->lines, item, line)
+ {
+line->tokens = _edi_search_clear_highlights(line->tokens);
+ }
+
search->current_search_line = 0;
elm_code_widget_selection_clear(editor->entry);
 

-- 

[EGIT] [tools/edi] master 03/04: search: highlight each found search result

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=5181c2219e749afc7887b0fa51443325054d4fdd

commit 5181c2219e749afc7887b0fa51443325054d4fdd
Author: Andy Williams 
Date:   Wed Jul 5 21:42:48 2017 +0100

search: highlight each found search result
---
 src/bin/editor/edi_editor_search.c | 54 +++---
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/bin/editor/edi_editor_search.c 
b/src/bin/editor/edi_editor_search.c
index 3152fc1..ea057a5 100644
--- a/src/bin/editor/edi_editor_search.c
+++ b/src/bin/editor/edi_editor_search.c
@@ -100,13 +100,14 @@ static Eina_Bool
 _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search *search)
 {
Eina_Bool try_next = EINA_FALSE;
-   Eina_List *item;
+   Eina_List *item, *subitem, *subitem_next;
Elm_Code *code;
Elm_Code_Line *line;
+   Elm_Code_Token *token;
const char *text_markup;
char *text;
-   unsigned int offset, pos_line, pos_col;
-   int found;
+   unsigned int offset, pos, pos_line, pos_col;
+   int found, match;
search->wrap = elm_check_state_get(search->checkbox);
 
text_markup = elm_object_text_get(search->entry);
@@ -135,34 +136,44 @@ _edi_search_in_entry(Evas_Object *entry, 
Edi_Editor_Search *search)
found = ELM_CODE_TEXT_NOT_FOUND;
EINA_LIST_FOREACH(code->file->lines, item, line)
  {
-if (!_edi_search_cache_exists(search))
+EINA_LIST_FOREACH_SAFE(line->tokens, subitem, subitem_next, token)
   {
- offset = 0;
- found = elm_code_line_text_strpos(line, text, offset);
- if (found == ELM_CODE_TEXT_NOT_FOUND)
-   continue;
-
- // find and store the first occurance of search
- _edi_search_cache_store(search, found, text, line,
-elm_code_widget_line_text_column_width_to_position(entry, 
line, found));
+ if (token->type == ELM_CODE_TOKEN_TYPE_MATCH)
+   line->tokens = eina_list_remove(line->tokens, token);
   }
+offset = 0;
+match = elm_code_line_text_strpos(line, text, offset);
+if (match == ELM_CODE_TEXT_NOT_FOUND)
+  continue;
+
+elm_code_line_token_add(line, match, match + strlen(text) - 1, 1, 
ELM_CODE_TOKEN_TYPE_MATCH);
+pos = elm_code_widget_line_text_column_width_to_position(entry, line, 
match);
+
+if (!_edi_search_cache_exists(search))
+  _edi_search_cache_store(search, match, text, line, pos);
 
 if (line->number < pos_line)
   continue;
 
-offset = 0;
 if (line->number == pos_line)
-  offset = elm_code_widget_line_text_position_for_column_get(entry, 
line, pos_col) + (try_next ? 1 : 0);
+  {
+ offset = elm_code_widget_line_text_position_for_column_get(entry, 
line, pos_col) + (try_next ? 1 : 0);
+
+ match = elm_code_line_text_strpos(line, text, offset);
+ if (match == ELM_CODE_TEXT_NOT_FOUND)
+   continue;
+
+ elm_code_line_token_add(line, match, match + strlen(text) - 1, 1, 
ELM_CODE_TOKEN_TYPE_MATCH);
+  }
 
-found = elm_code_line_text_strpos(line, text, offset);
 if (found == ELM_CODE_TEXT_NOT_FOUND)
-  continue;
+  {
+ // store first occurence of search from cursor position
+ search->current_search_line = line->number;
+ search->current_search_col = pos;
 
-// store first occurence of search from cursor position
-search->current_search_line = line->number;
-search->current_search_col =
-  elm_code_widget_line_text_column_width_to_position(entry, line, 
found);
-break;
+ found = match;
+  }
  }
 
search->term_found = found != ELM_CODE_TEXT_NOT_FOUND;
@@ -186,6 +197,7 @@ _edi_search_in_entry(Evas_Object *entry, Edi_Editor_Search 
*search)
else
  evas_object_hide(search->wrapped);
 
+   line = elm_code_file_line_get(elm_code_widget_code_get(entry)->file, 
search->current_search_line);
elm_code_widget_cursor_position_set(entry, search->current_search_line,
   search->current_search_col);
elm_code_widget_selection_start(entry, search->current_search_line,

-- 

[EGIT] [core/efl] master 01/01: elm_code: Add rust syntax

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=8b8a43759ca2325703749d33263e3c736ec9c122

commit 8b8a43759ca2325703749d33263e3c736ec9c122
Author: Andy Williams 
Date:   Mon Jul 3 22:17:07 2017 +0100

elm_code: Add rust syntax
---
 src/lib/elementary/elm_code_syntax.c | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/src/lib/elementary/elm_code_syntax.c 
b/src/lib/elementary/elm_code_syntax.c
index 5fbb415ada..27b460b7c1 100644
--- a/src/lib/elementary/elm_code_syntax.c
+++ b/src/lib/elementary/elm_code_syntax.c
@@ -29,6 +29,18 @@ static Elm_Code_Syntax _elm_code_syntax_c =
   "struct", "switch", "typedef", "union", "unsigned", "void", "volatile", 
"while", NULL}
 };
 
+static Elm_Code_Syntax _elm_code_syntax_rust =
+{
+   "-*!&+/%|^<=>:;.,{}()[]",
+   "#",
+   "//",
+   NULL,
+   NULL,
+   {"as", "break", "const", "continue", "create", "else",  "enum", "extern", 
"false", "fn", "for", "if", \
+  "impl", "in", "let", "loop", "match", "mod", "move", "mut", "pub", 
"ref", "return", "Self", "self", \
+  "static", "struct", "super", "trait", "true", "type", "unsafe", "use", 
"where", "while", NULL}
+};
+
 static Elm_Code_Syntax _elm_code_syntax_py =
 {
"{}()[]:;%/*+!=<->,.",
@@ -70,6 +82,8 @@ elm_code_syntax_for_mime_get(const char *mime)
 
if (!strcmp("text/x-chdr", mime) || !strcmp("text/x-csrc", mime))
  return &_elm_code_syntax_c;
+   if (!strcmp("text/rust", mime))
+ return &_elm_code_syntax_rust;
if (!strcmp("text/x-python", mime))
  return &_elm_code_syntax_py;
if (!strcmp("text/x-eolian", mime))

-- 

[EGIT] [website/extra-server] master 01/01: flat: Update to lastest WIP version

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/website/extra-server.git/commit/?id=3a78a20df91a2ec2881b41658ff918c1a0bd105d

commit 3a78a20df91a2ec2881b41658ff918c1a0bd105d
Author: Andy Williams 
Date:   Fri Jun 30 13:07:44 2017 +0100

flat: Update to lastest WIP version
---
 public_html/extra/assets/themes/flat-2.edj | Bin 0 -> 8974985 bytes
 public_html/extra/data.py  |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public_html/extra/assets/themes/flat-2.edj 
b/public_html/extra/assets/themes/flat-2.edj
new file mode 100644
index 000..eb67bc8
Binary files /dev/null and b/public_html/extra/assets/themes/flat-2.edj differ
diff --git a/public_html/extra/data.py b/public_html/extra/data.py
index 6642b92..f417d34 100644
--- a/public_html/extra/data.py
+++ b/public_html/extra/data.py
@@ -34,8 +34,8 @@ THEMES = {
 'theme_id': 'flat',
 'name': 'Flat',
 'author': 'Raster',
-'description': 'A early stage flat theme',
-'version': 1,
+'description': 'A WORK IN PROGRESS flat theme',
+'version': 2,
   }
 }
 BACKGROUNDS = {

-- 

[EGIT] [tools/edi] master 02/02: ui: Use correct icon naming for FDO arrows

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=a8d62ded23d6c5dea26a30a4be9363d7b0edf1b1

commit a8d62ded23d6c5dea26a30a4be9363d7b0edf1b1
Author: Andy Williams 
Date:   Thu Jun 29 21:25:26 2017 +

ui: Use correct icon naming for FDO arrows
---
 src/bin/edi_main.c | 38 +++---
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 4b5075f..02d8d45 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -242,12 +242,12 @@ _edi_toggle_file_panel(void *data, Evas_Object *obj 
EINA_UNUSED, void *event_inf
 
if (size == 0.0)
  {
-elm_icon_standard_set(_edi_filepanel_icon, "stock_left");
+elm_icon_standard_set(_edi_filepanel_icon, "go-previous");
 _edi_slide_panel_new(_edi_leftpanes, panel, 
_edi_project_config->gui.leftsize, EINA_TRUE, EINA_TRUE);
  }
else
  {
-elm_icon_standard_set(_edi_filepanel_icon, "stock_right");
+elm_icon_standard_set(_edi_filepanel_icon, "go-next");
 _edi_slide_panel_new(_edi_leftpanes, panel, 
_edi_project_config->gui.leftsize, EINA_FALSE, EINA_TRUE);
  }
 }
@@ -273,7 +273,7 @@ _edi_toggle_panel(void *data, Evas_Object *obj, void 
*event_info)
 
if (item == _edi_selected_bottompanel)
  {
-elm_toolbar_item_icon_set(item, "stock_up");
+elm_toolbar_item_icon_set(item, "go-up");
 
 _edi_slide_panel_new(_edi_bottompanes, panel, 
_edi_project_config->gui.bottomsize, EINA_FALSE, EINA_FALSE);
 _edi_selected_bottompanel = NULL;
@@ -281,8 +281,8 @@ _edi_toggle_panel(void *data, Evas_Object *obj, void 
*event_info)
else
  {
 if (_edi_selected_bottompanel)
-  elm_toolbar_item_icon_set(_edi_selected_bottompanel, "stock_up");
-elm_toolbar_item_icon_set(item, "stock_down");
+  elm_toolbar_item_icon_set(_edi_selected_bottompanel, "go-up");
+elm_toolbar_item_icon_set(item, "go-down");
 
 size = elm_panes_content_right_size_get(_edi_bottompanes);
 if (size == 0.0)
@@ -382,9 +382,9 @@ edi_content_setup(Evas_Object *win, const char *path)
 
icon = elm_icon_add(content_in);
if (_edi_project_config->gui.leftopen)
- elm_icon_standard_set(icon, "stock_left");
+ elm_icon_standard_set(icon, "go-previous");
else
- elm_icon_standard_set(icon, "stock_right");
+ elm_icon_standard_set(icon, "go-next");
button = elm_button_add(content_in);
elm_object_part_content_set(button, "icon", icon);
elm_object_focus_allow_set(button, EINA_FALSE);
@@ -434,27 +434,27 @@ edi_content_setup(Evas_Object *win, const char *path)
 
_edi_toolbar_separator_add(tb);
 
-   _edi_logpanel_item = elm_toolbar_item_append(tb, "stock_up", "Logs",
+   _edi_logpanel_item = elm_toolbar_item_append(tb, "go-up", "Logs",
 _edi_toggle_panel, "0");
_edi_toolbar_separator_add(tb);
 
-   _edi_consolepanel_item = elm_toolbar_item_append(tb, "stock_up", "Console",
+   _edi_consolepanel_item = elm_toolbar_item_append(tb, "go-up", "Console",
 _edi_toggle_panel, "1");
_edi_toolbar_separator_add(tb);
 
-   _edi_testpanel_item = elm_toolbar_item_append(tb, "stock_up", "Tests",
+   _edi_testpanel_item = elm_toolbar_item_append(tb, "go-up", "Tests",
  _edi_toggle_panel, "2");
_edi_toolbar_separator_add(tb);
 
-   _edi_searchpanel_item = elm_toolbar_item_append(tb, "stock_up", "Search",
+   _edi_searchpanel_item = elm_toolbar_item_append(tb, "go-up", "Search",
  _edi_toggle_panel, "3");
_edi_toolbar_separator_add(tb);
 
-   _edi_taskspanel_item = elm_toolbar_item_append(tb, "stock_up", "Tasks",
+   _edi_taskspanel_item = elm_toolbar_item_append(tb, "go-up", "Tasks",
   _edi_toggle_panel, "4");
_edi_toolbar_separator_add(tb);
 
-   _edi_debugpanel_item = elm_toolbar_item_append(tb, "stock_up", "Debug",
+   _edi_debugpanel_item = elm_toolbar_item_append(tb, "go-up", "Debug",
   _edi_toggle_panel, "5");
_edi_toolbar_separator_add(tb);
 
@@ -503,32 +503,32 @@ edi_content_setup(Evas_Object *win, const char *path)
 elm_panes_content_right_size_set(logpane, 
_edi_project_config->gui.bottomsize);
 if (_edi_proje

[EGIT] [tools/edi] master 01/02: config: Correct project name comparison for substrings

[Andy Williams]

ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=a34a71f8f64c9167fa3f96ef95c1b3e9e17cc9ee

commit a34a71f8f64c9167fa3f96ef95c1b3e9e17cc9ee
Author: Andy Williams 
Date:   Thu Jun 29 21:18:15 2017 +

config: Correct project name comparison for substrings
---
 src/bin/edi_config.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/bin/edi_config.c b/src/bin/edi_config.c
index 93339bd..4ae8549 100644
--- a/src/bin/edi_config.c
+++ b/src/bin/edi_config.c
@@ -353,7 +353,8 @@ _edi_config_project_add(const char *path)
 
EINA_LIST_FOREACH_SAFE(_edi_config->projects, list, next, project)
  {
-if (!strncmp(project->path, path, strlen(project->path)))
+if (strlen(project->path) == strlen(path) &&
+!strncmp(project->path, path, strlen(project->path)))
   _edi_config->projects = eina_list_remove_list(_edi_config->projects, 
list);
  }
 

--