Re: [E-devel] Approval for Phabricator
\o/ On Sat, Oct 16, 2021 at 10:42 PM Carsten Haitzler wrote: > On Sat, 16 Oct 2021 21:49:55 +0200 maximilian-l...@gmx.de said: > > > Hello everybody, > > > > How can I be approved for Phabricator? I want to make a pull request for > > Enlightenment, that is necessary for my Perl bindings. > > as the user registration said - come to #e on IRC (libera) to prove you are > a real human and not a spam bot or just someone paid to create spam (sorry > - > have had far too much on that on phabricator thus it's now become this > process). You tell us your user and it gets approved :) > > -- > - Codito, ergo sum - "I code, therefore I am" -- > Carsten Haitzler - ras...@rasterman.com > > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Fwd: [Bug 256408] devel/efl: efreetd crashes with "Abort trap", thus application menu icons disappear
guard it with ifdef and submit to phab. On Fri, Jun 4, 2021 at 10:22 AM Quelrond wrote: > Hello, > > Could you have a look to this patch, please? > > Peter > > Forwarded Message > Subject:[Bug 256408] devel/efl: efreetd crashes with "Abort trap", > thus application menu icons disappear > Date: Fri, 04 Jun 2021 09:15:59 + > From: bugzilla-nore...@freebsd.org > To: enlightenm...@freebsd.org > > > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=256408 > > Bug ID: 256408 > Summary: devel/efl: efreetd crashes with "Abort trap", thus > application menu icons disappear > Product: Ports & Packages > Version: Latest > Hardware: Any > OS: Any > Status: New > Severity: Affects Many People > Priority: --- > Component: Individual Port(s) > Assignee: enlightenm...@freebsd.org > Reporter: e...@potensol.com > Flags: maintainer-feedback?(enlightenm...@freebsd.org) > Assignee: enlightenm...@freebsd.org > Attachment #225539 text/plain > mime type: > > Created attachment 225539 > --> https://bugs.freebsd.org/bugzilla/attachment.cgi?id=225539&action=edit > Patch for devel/efl to fix eftreetd crash. > > I have discovered a pretty major bug in efl which affects efreetd and in > turn > affects enlightenment. It happens when a large number of icons or theme > resources / assets are installed into /usr/local/share/... The efreetd > daemon > crashes with "Abort trap" error message when run from a users terminal. It > causes the application menu icons to disappear, partially or fully. It > can also > cause an error message about efreetd (cache) not connecting with a > timeout. It > also causes problems with the initial enlightenment prompts with a fresh .e > profile. > > I have a good solution that I have a patch for an immediate fix, until I > make a > PR with the upstream efl project. I'd like to hear the thoughts of the > FreeBSD > enlightenment team before I engage with them. > > Steps to reproduce: > Install any major KDE app like Dolphin, Gwenview, Okular etc. Or > specifically > kf5-breeze-icons. Then run efreetd as a regular user from a TTY (no X > sessions > running). > > I have a more thorough description of the problem on the FreeBSD Forums: > > https://forums.freebsd.org/threads/solved-enlightenment-application-menu-icons-missing-due-to-efreetd-crashing.80743/ > > The patch is attached. > > Is it possible to get an enlightenment port revision with this patch out > the > door ASAP. I have been running it in production on my media-centre for > almost 2 > weeks now, no issues. Everything else seems fine, the performance seems > to be > as good if not better than the same version of Enlightenment/EFL on Manjaro > Linux (very similar hardware). > > It's a pretty urgent bug fix. I am new to enlightenment and loving it > now. But > I very nearly turned my back on it an use KDE instead, before even > giving it a > chance. If I had known it would take me 2-3 solid weeks to find the bug > I never > would have started. This is not just personal time, it is work time that I > would not be spending, had I known how long it would take. It only took > about 5 > mins to fix once I found the problem, but that's usually how it goes with > debugging. > > -- > You are receiving this mail because: > You are the assignee for the bug. > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [e-users] Flat has landed
\o/ On Sat, 27 Mar 2021, 19:06 , wrote: > On 3/27/21 5:10 PM, Carsten Haitzler wrote: > > For those who are not watching git commits... > > > > Flat theme has landed in git master efl today. > > > > Yay! > > > Great news! Congratulations for all your work! > > > -- > Maderios > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Efreetd Question
Hi, If an EFL application is running in Enlightenment, is there any benefit for efreetd to run each time an application launches (EFL)? What problems would there be if applications did not check for/and update caches if Enlightenment was running? ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Terminology 1.9.0
Bravo Boris! On Mon, 18 Jan 2021, 21:58 Boris Faure, wrote: > On 21-01-18 22:21, Boris Faure wrote: > > > > “Shoot for the stars, > > but if you happen to miss, > > shoot for the moon instead.” > >Neil Armstrong > > > > > > > > Hello fellow Terminology enthusiasts! > > > > Winter with its long nights can be hard but can also bring some nice > > improvements to Terminology! > > > > The detailed change log lists them below: > > > > == Additions == > > * Colorshemes: easily change the colors of the terminal > > * Add the following color schemes: Tango Dark, Tango light, Dracula, > > Belafonte Day, Belafonte Night, Material, Fahrenheit, > > Tomorrow Night Burns, PaleNight, Soft Era, One Dark, Cobalt2 > > * New translations: Chinese (Simplified), Japanese, > > Norwegian Bokmål, Russian and Ukrainian > > * Handle `OSC 12` to change the cursor color > > > > == Improvements == > > * Translation updates for Catalan, Croatian, Danish, Dutch, French, > > German, Italian, Spanish > > * Add font search in the fonts panel > > * Set `TERM` to `xterm_256color` by default > > * Focus simplifications when going into the settings > > * Tests: better compatibility with debian-based systems > > > > == Fixes == > > * Fix `tyls` with png/jpg thumbnails > > > > == Download == > > The tarball can be found at : > > - > https://download.enlightenment.org/rel/apps/terminology/terminology-1.9.0.tar.xz > > - https://downloads.terminolo.gy/terminology-1.9.0.tar.xz > > sha256sum: > > 640b9d2581db968d2ca4cd3ee90a36dd8165a0273bf08a561ffdc7755951d96e > One should read: > 3f3bc327da5cc239d468570afed29a17e2fda3b1fee02b28f02ee7ed5141e46c > > I've re-uploaded a new tarball with one change: make this release pass > all the tests. The test that was failing was about the new version name! > That's the only change. > > > -- > Boris Faure > Pointer Arithmetician > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Unable to login E wiki
done. On Thu, Sep 24, 2020 at 6:40 PM Davide Andreoli wrote: > Hi guys, > > I'm not able anymore to login to the wiki to change the python-efl release > link, > I don't see any error msg on login, it just not work when I insert my > user/pwd > > Can someone please update the version to 1.25 in the python-efl download > link? > the page is: http://www.enlightenment.org/download > > Thanks in advance > DaveMDS > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] EFL - FreeBSD Jenkins build failed
Peter, I've only got a stock amd64 12.1-RELEASE-p7. I cannot test specifically as per your conditions, but the build does not fail (fresh tree). Can you find the specific commit? Perhaps someone else may be able to answer why it is failing there. On Mon, Aug 24, 2020 at 10:21 AM Quelrond wrote: > Hello! > > My Jenkins cannot build EFL anymore. > > It seems that the problem appeared starting from one of these commits: > > 1. eina: Close file in unlink test (commit: bfc3e9f > < > https://github.com/Enlightenment/efl/commit/bfc3e9f96ec3089545bcd67c3c2a4c9e9c4f405f > >) > > 2. eina_test_lock.c: Implement clock_gettime for Windows (commit: > 1ee6e02 > < > https://github.com/Enlightenment/efl/commit/1ee6e020bb623e91df9c10a161efd01ba2a45603 > >) > 3. ecore x - go back to vsync thread. this will be more reliable > (commit: cef058c > < > https://github.com/Enlightenment/efl/commit/cef058c48b21c6effed8d6580876632b4344ec7f > >) > > 4. ecore - don't do anything with heap between fork and exec (commit: > 4b4c208 > < > https://github.com/Enlightenment/efl/commit/4b4c208d99358941cfe886bc1a87e38c2390f0bd > >) > 5. evas - fix deadlock with sw async rendering calling cbs in post > flush (commit: db8e598 > < > https://github.com/Enlightenment/efl/commit/db8e59835193ef9b041cb36dae8b96232be3da08 > >) > > > During the build we try to create test_external.edj, default.edj and > player_entry.edj using edje_cc. These commands are started _twice_ (with > the same arguments) one instance of every command starts to use 100% of > CPU, the build is never finished. > > The commands are: > > /root/efl/build/src/bin/edje/edje_cc -beta -fastcomp -sd > /root/efl/data/elementary/objects -id > /root/efl/data/elementary/themes/img -id > /root/efl/data/elementary/objects -fd /root/efl/data/elementary/objects > ../data/elementary/objects/test_external.edc > data/elementary/objects/test_external.edj > > /root/efl/build/src/bin/edje/edje_cc -beta -fastcomp -deps > data/elementary/themes/default.edj.d -sd > /root/efl/data/elementary/themes/snd -id > /root/efl/data/elementary/themes/img -id > /root/efl/data/elementary/themes/fdo -fd > /root/efl/data/elementary/themes/fnt > ../data/elementary/themes/default.edc data/elementary/themes/default.edj > > /root/efl/build/src/bin/edje/edje_cc -id > /root/efl/data/elementary/themes/img -sd > /root/efl/data/elementary/themes/snd > ../src/bin/exactness/player_entry.edc src/bin/exactness/player_entry.edj > > Could someone fix it, please? > > Peter > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] New video on Terminology: Handling of links
Très agréable. Bon travail :) On Tue, Jul 21, 2020 at 7:17 PM Vincent Torri wrote: > very nice ! good job ! > > Vincent > > On Tue, Jul 21, 2020 at 3:06 PM Boris Faure wrote: > > > > I just wanted to let you know that I made a small video about links in > > Terminology. It's hosted on youtube at > > https://www.youtube.com/watch?v=Q3uoFsWQuFQ > > > > There's a show case about a new feature coming soon in the next release. > > > > Have a nice day! > > -- > > Boris Faure > > Pointer Arithmetician > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Suggest to remove Evas Canvas3D
Isn't onefang using it?? On Thu, 12 Mar 2020, 13:07 Carsten Haitzler, wrote: > On Thu, 12 Mar 2020 20:38:43 +0900 Hermet Park > said: > > > Hello, > > > > More than 6 years, Evas Canvas3D is not maintained properly, not used at > > all. just remained as bothersome for us. > > > > What do you think if we remove it? > > +1 > > -- > - Codito, ergo sum - "I code, therefore I am" -- > Carsten Haitzler - ras...@rasterman.com > > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Evisum 0.3.0
Hello, Releasing Evisum 0.3.0. See: https://download.enlightenment.org/rel/apps/evisum/evisum-0.3.0.tar.xz ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] EDD Meeting point
Thanks xavi!! On Fri, 22 Nov 2019, 11:28 Xavi Artigas, wrote: > Hi again, > > To be extra explicit, these are the GPS coordinates: 41.389621, 2.191465 > > Xavi > > On Fri, 22 Nov 2019 at 10:05, Xavi Artigas > wrote: > > > Hello dear EDD attendants, > > > > I am eager to see you all on Saturday in Barcelona! > > Given that at 10am we should be preparing the room, I propose we meet at > > 9:45am at the main gate of the UPF university (Ciutadella Campus): > > Carrer Ramon Trias Fargas, 25 > > https://goo.gl/maps/VeDRYs1hT8XSq3KW6 > > > > My phone number is +34628155404, feel free to contact me through > Whatsapp, > > Telegram, Signal or Hangouts if you have any problem. > > > > This is how the meeting point looks like on a sunny day: > > [image: image.png] > > > > Xavi > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Focus issues.
On Sun, Sep 29, 2019 at 1:23 PM Carsten Haitzler wrote: > it should only happen on a restart,. switch desktops around (go to every > desktop) and it'll fix it up. > Can't this be fixed in software? ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] the efl do not compile on Windows
The C++ bindings seems to be enabled now by default. When disabling them, EFL will buil. I noticed the build breaks on FreeBSD. Unfortunately I have no time to be able assist anymore than this. On Thu, Sep 26, 2019 at 2:22 PM Vincent Torri wrote: > hello > > today, before going to work, i quickly launched a compilation of the > git cloned yesterday and there was a compilation failure related to > c++. I'll launch a new compilation in a few hours at home and tell you > what the problem is > > Vincent > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] System Monitor
Hello, I've had some time to work on this program. Added some new features to the GUI and command-line helper application. I've tried testing rigorously. https://download.enlightenment.org/rel/apps/evisum/evisum-0.2.6.tar.xz ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Evisum Release
Hi, Some minor changes and overall improvements: https://download.enlightenment.org/rel/apps/evisum/evisum-0.2.2.tar.xz Alastair ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] SSH Access to Download.e.org
Hi, Can anyone help me with ssh access to download.enlightenment.org? My original ssh config is no longer working. Some thing changed (it has been a while since I last connected/uploaded). Does anyone have a working .ssh/config example? Thanks in advance! netstar ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Introducing ewpi : a package installer for EFL dependencies on Windows
Great job Vincent! On Wed, Mar 20, 2019 at 7:08 PM Vincent Torri wrote: > Hello > > Since win-builds has not been updated for around 3 years, I decided to > write a simple installer of the dependencies of the EFL on Windows. > > Unlike win-builds, it is NOT a package manager, it just downloads the > sources, untar them, builds from sources and installs them in the same > prefix. This ensures, like win-builds, that all the packages has been > compiled with the same toolchain. > > Even if it is easy to add any library/application, the purpose of ewpi > is only for EFL dependencies on Windows (and eventually the EFL > themselves and some applications like ephoto or rage) > > compared to win-builds, some additional packages are provided for the EFL : > > harfbuzz > libwebp > bullet (for ephysics) > gstreamer 1 > > For now, there are 54 libraries installed by ewpi (see github repo > below). As of today, ewpi installs the latest versions of these > libraries. > > For more informations on how to get and use ewpi : > > https://github.com/vtorri/ewpi > https://phab.enlightenment.org/w/windows/ > > I have successfully installed the dependencies on Windows 7 64 bits > (with MSYS2 and mingw-w64) and Mageia (mingw-w64 toolchain). > > If some people want to play with ewpi and encounter problems or want > additional features, please open an issue on github > > regards > > Vincent Torri > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Goodbye
Hey Derek, Wishing you all the best in the future. As with everyone else, thanks for all the work you have done. On Tue, Feb 19, 2019 at 6:04 AM cnook wrote: > Hey I am sorry for losing chance working with you any more. I have loved > your elegant words and lines in the EFL world. Thank you for having that > kind of delight. I hope you find your own great way leading to happiness. > Good luck and God bless you! > > Sincerely > Shinwoo Kim > > > > 2019년 2월 19일 (화) 오전 11:25에 Hermet Park 님이 작성: > > > Derek, > > > > Though it's shame that your're leaving the community, > > But I believe you have a better opportunity for your way. > > > > Thanks for your huge contribution for years. > > > > Good Luck! > > > > Best Regards, > > > > On Sat, Feb 16, 2019 at 12:48 AM Stephen Houston > > wrote: > > > > > Thank you for all of your valuable contributions. It was a privilege > to > > > work with you and get to know you. Best of luck in your future > > endeavors! > > > > > > Stephen > > > > > > On Thu, Feb 14, 2019 at 10:00 PM Derek Foreman < > > > derek.foreman.sams...@gmail.com> wrote: > > > > > > > As some of you already know, today is my last day working for > Samsung, > > > and > > > > I no longer have a financial incentive to contribute to EFL. > > > > > > > > One of my primary reasons for leaving this position is that it was > tied > > > to > > > > a continued requirement to work on EFL, and I've grown weary of doing > > > that, > > > > so I won't be lingering as a community developer. > > > > > > > > Over the years there have been times when I've felt EFL was on the > cusp > > > of > > > > outgrowing its hobby project roots and making a shift towards > grown-up > > > > standards (incorporating peer review, CI, a push for better > > > documentation), > > > > followed by events that felt like major setbacks on that path. Some > > days > > > > it felt like we were reducing the insurmountable mountain of > technical > > > > debt, and other days hopelessly watching it increase. > > > > > > > > EFL is currently in a situation where leadership is frequently at > odds > > > with > > > > the majority of contributors, and this leads to developers finding > > > > themselves worrying that work they've been paid to do (and maybe > > > sometimes > > > > have even done well) will be unilaterally reverted, possibly with > > threats > > > > of commit right revocation. This makes contributing pointlessly > > > stressful, > > > > and drives developers away. > > > > > > > > I hope I've left my small corners of the project a little better > than I > > > > found them, and I thank you all for an opportunity to contribute. > I've > > > met > > > > some excellent people in my time here, and hope to keep in touch. > I'll > > > > still be around on all the regular IRC servers, feel free to contact > > me*. > > > > > > > > Best of luck, > > > > Derek > > > > > > > > * Just not about EFL. Ever. Seriously. > > > > > > > > ___ > > > > enlightenment-devel mailing list > > > > enlightenment-devel@lists.sourceforge.net > > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > > -- > > Regards, Hermet > > > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Linux subsystem on windows
Yes, stats are as follows: Total users: 0. ;-) On Tue, Jan 22, 2019 at 8:40 AM Jonathan Aquilina wrote: > I say why not. I am willing to work on it slowly slowly. > > My question becomes do we have any stats of enlightenement usage by > windows users? > > -Original Message- > From: Felipe Magno de Almeida > Sent: 22 January 2019 06:53 > To: Enlightenment developer list < > enlightenment-devel@lists.sourceforge.net> > Subject: Re: [E-devel] Linux subsystem on windows > > On Tue, Jan 22, 2019 at 3:04 PM Jonathan Aquilina > wrote: > > > > As far as I know no, but cant we use what ever windows uses to display > their UI? > > Yes, but then it is not a window manager is it? I think you could port > Enlightenment Wayland to Windows, running in Fullscreen. > You will probably find a lot of difficults, but I guess it can be possible. > > > -Original Message- > > From: Felipe Magno de Almeida > > Sent: 22 January 2019 06:49 > > To: Enlightenment developer list > > > > Subject: Re: [E-devel] Linux subsystem on windows > > > > On Tue, Jan 22, 2019 at 2:16 PM Jonathan Aquilina < > jaquil...@eagleeyet.net> wrote: > > > > > > I was just wondering given the fact that it's a part of windows now > how it would simplify the building of enlightenment on windows in the sense > before you probably would have needed mingw or Cygwin. I might give it a > try this coming weekend and start documenting on the wiki if I can or on > phab. > > > > The Linux Subsystem doesn't work with X11, you need a a Windows X11 > server. And I don't know any X11 server which runs window managers on > Windows. Is there? > > > > > Regards, > > > Jonathan. > > > > > > -Original Message- > > > From: Felipe Magno de Almeida > > > Sent: 22 January 2019 04:09 > > > To: Enlightenment developer list > > > > > > Subject: Re: [E-devel] Linux subsystem on windows > > > > > > On Sun, Jan 13, 2019 at 2:18 AM Jonathan Aquilina < > jaquil...@eagleeyet.net> wrote: > > > > > > > > Hi Guys, > > > > > > > > I have an interesting thing I would like to work on. > > > > > > > > Has anyone tried to build enlightenement through the linux subsystem > on windows? > > > > > > Not yet, but I'll probably try soon. > > > > > > > Regards, > > > > Jonathan > > > > > > > > ___ > > > > enlightenment-devel mailing list > > > > enlightenment-devel@lists.sourceforge.net > > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > > > > > -- > > > Felipe Magno de Almeida > > > > > > > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > > -- > > Felipe Magno de Almeida > > > > > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > ___ > > enlightenment-devel mailing list > > enlightenment-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > -- > Felipe Magno de Almeida > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] E5v1 - Evisum
Hi all, Just uploaded a package for Evisum. https://download.enlightenment.org/rel/apps/evisum/evisum-0.2.0.tar.xz Server is back up again! ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Evisum: 0.2.1 release.
Hi, Just small announcement of minor release of evisum. Really just fixes of minor annoyances. (SHA256) 1fbb98e5306be1403f3c8be09c046fd6e0554b6f791c53aebbcc61899baeb288 evisum-0.1.2.tar.xz Which can be downloaded from: https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.2.tar.xz Thanks to Apostolos Bartiziokas for reports and ideas. Happy hacking all! ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Commit access for Xavi
Definitely no objection here! Thanks Xavi for all the work you are doing! On Fri, Sep 21, 2018 at 4:46 PM Christopher Michael wrote: > > Hi All, > > I would like to propose that we move Xavi from probie to full commit > rights. He has been doing great work with efl documentation, and is also > working on examples. Would there be any objections to moving him out of > probie status ?? > > > Kind Regards, > > dh > > > > > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Edi 0.7.0 reelease
Hello, This morning we released the latest version of Edi (0.7.0) which is available to download[1]. Finally with the release of the efl 1.21.x series we have support for themes within Edi. We also added translucency and other visual tweaks to improve continuity. Some refactoring and implementation of existing code has been introduced also. The release is dependent on the efl-1.21.1 release which has included some additional fixes and improvements to the elm_code widget. Hopefully you'll find this version a little more polished as we move towards 1.0. Feedback is always appreciated. Thanks! Alastair [1]: https://github.com/Enlightenment/edi/releases/download/v0.7.0/edi-0.7.0.tar.xz ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Expose and Desksanity
On Sat, Sep 8, 2018 at 6:34 AM Simon Lees wrote: > > My opinion on this is anyone who has a module that is of acceptable > standard both not full of bugs / causing e to crash, and is coded > soundly (Meets coding standards / same kind of code review for any part > of the e code base). Should be able to submit there module into e, > whether that module is enabled by default is another question but having > installed but not loaded modules hardly adds bloat. Modules are also > significantly easier to maintain when in tree. This combined with the > perception from the e17 days that in tree modules were supported > upstream while out of tree modules were not makes it clear to me that we > should generally try to allow them. > I agree with this Simon. Also am hoping that Mike could introduce some of the features into an in-tree version of desksanity. I'm certain it meets every expected standard, and I've been testing very thoroughly. This module has improved my own productivity using E for development greatly. I wrote the original e-mail because of the fact that it raises productivity within E and I'm very sure for most people it will improve the user experience and most probably (I do believe) encourage developers of EFL to actually use E as their development environment, which is something I know many have pushed for a long time. In summary this is a great addition to the user experience and I think it would encourage developers to be using E for development. It should be (in some form) within the main tree. ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Expose and Desksanity
Hi all, I just wanted to talk about the desksanity module that zmike wrote. I've been using this module for a month now, for me personally the expose-like feature is most useful. I have this event bound to Super+ESC or top left corner (as GNOME does). I really believe that this functionality should be in E itself. I just wanted to encourage some conversation on the topic, and also suggest that if you haven't tried using this module, to try using it. Here is the URL for the module: https://git.enlightenment.org/enlightenment/modules/desksanity.git/ Thanks, Alastair (netstar) -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Gitlab
Hello, I agree with you there Marcel. It's an awful lot of work with zero guaranteed improvement. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] EFL 1.22 Development and Features
Hello all, With the 1.21 release of EFL coming to closure and its soon release, now is the right time for us all to decide where to focus development efforts in the EFL 1.22 release cycle. There will be 12 weeks of development time available for 1.22. There are two polls listing proposed changes in this new development cycle. You can keep track of them both here: https://phab.enlightenment.org/T7283 The two polls are at: https://phab.enlightenment.org/V36 and https://phab.enlightenment.org/V37. Please can you spend some time looking at these proposals and express your opinion on which of these proposals you oppose work being done on in the EFL 1.22 development time. Thanks very much, Alastair (netstar) -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Probie Proposal: Bryce Harrington
Sounds good to me! On Wed, Jul 25, 2018 at 7:16 PM, Mike Blumenkrantz wrote: > Hello, > > I'd like to propose probie access for Bryce. He's been doing consistent > work writing and improving EFL documentation for some time now, and I > expect that the quantity and quality of his contributions will only be > increasing going forward. > > Will give this mail thread a week or so to evaluate the proposal before any > action is taken. > > Regards, > Mike > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: efl_ui_widget: silence warnings with clang.
Yes as discussed privately that is fine.
On Fri, Jun 22, 2018 at 5:49 PM, Mike Blumenkrantz
wrote:
> Hi,
>
> This directly conflicts with https://phab.enlightenment.org/D6343 which was
> submitted through patch review instead of being directly pushed to the repo.
> Please submit patches through the review system in the future in order to
> avoid this type of conflict.
>
> Thanks,
> Mike
>
> On Fri, Jun 22, 2018 at 4:12 AM Alastair Poole wrote:
>>
>> netstar pushed a commit to branch master.
>>
>>
>> http://git.enlightenment.org/core/efl.git/commit/?id=91e146f108d12f1369f26f839b48be5901373df2
>>
>> commit 91e146f108d12f1369f26f839b48be5901373df2
>> Author: Alastair Poole
>> Date: Fri Jun 22 09:11:32 2018 +0100
>>
>> efl_ui_widget: silence warnings with clang.
>>
>> Clang doesn't like dangling else.
>> ---
>> src/lib/elementary/efl_ui_widget.c | 40
>> +++---
>> 1 file changed, 24 insertions(+), 16 deletions(-)
>>
>> diff --git a/src/lib/elementary/efl_ui_widget.c
>> b/src/lib/elementary/efl_ui_widget.c
>> index 12377d4718..df8fe6020a 100644
>> --- a/src/lib/elementary/efl_ui_widget.c
>> +++ b/src/lib/elementary/efl_ui_widget.c
>> @@ -2654,10 +2654,12 @@ _efl_ui_widget_scroll_hold_push(Eo *obj,
>> Elm_Widget_Smart_Data *sd)
>> EINA_LIST_FOREACH(sd->subobjs, l, child)
>> {
>>if (elm_widget_is(child) && _elm_scrollable_is(child))
>> -if (elm_widget_is_legacy(obj))
>> - elm_interface_scrollable_hold_set(child,
>> EINA_TRUE);
>> -else
>> - efl_ui_scrollable_scroll_hold_set(child,
>> EINA_TRUE);
>> +{
>> + if (elm_widget_is_legacy(obj))
>> + elm_interface_scrollable_hold_set(child,
>> EINA_TRUE);
>> + else
>> + efl_ui_scrollable_scroll_hold_set(child,
>> EINA_TRUE);
>> +}
>> }
>>}
>> }
>> @@ -2686,10 +2688,12 @@ _efl_ui_widget_scroll_hold_pop(Eo *obj,
>> Elm_Widget_Smart_Data *sd)
>> EINA_LIST_FOREACH(sd->subobjs, l, child)
>> {
>>if (elm_widget_is(child) && _elm_scrollable_is(child))
>> -if (elm_widget_is_legacy(obj))
>> - elm_interface_scrollable_hold_set(child,
>> EINA_FALSE);
>> -else
>> - efl_ui_scrollable_scroll_hold_set(child,
>> EINA_FALSE);
>> +{
>> + if (elm_widget_is_legacy(obj))
>> + elm_interface_scrollable_hold_set(child,
>> EINA_FALSE);
>> + else
>> + efl_ui_scrollable_scroll_hold_set(child,
>> EINA_FALSE);
>> + }
>> }
>>}
>> }
>> @@ -2727,10 +2731,12 @@ _efl_ui_widget_scroll_freeze_push(Eo *obj,
>> Elm_Widget_Smart_Data *sd)
>> EINA_LIST_FOREACH(sd->subobjs, l, child)
>> {
>>if (elm_widget_is(child) && _elm_scrollable_is(child))
>> -if (elm_widget_is_legacy(obj))
>> - elm_interface_scrollable_freeze_set(child,
>> EINA_TRUE);
>> -else
>> - efl_ui_scrollable_scroll_freeze_set(child,
>> EINA_TRUE);
>> +{
>> + if (elm_widget_is_legacy(obj))
>> + elm_interface_scrollable_freeze_set(child,
>> EINA_TRUE);
>> + else
>> + efl_ui_scrollable_scroll_freeze_set(child,
>> EINA_TRUE);
>> +}
>> }
>>}
>> }
>> @@ -2759,10 +2765,12 @@ _efl_ui_widget_scroll_freeze_pop(Eo *obj,
>> Elm_Widget_Smart_Data *sd)
>> EINA_LIST_FOREACH(sd->subobjs, l, child)
>> {
>>if (elm_widget_is(child) && _elm_scrollable_is(child))
>> -if (elm_widget_is_legacy(obj))
>> - elm_interface_scrollable_freeze_set(child,
>> EINA_FALSE);
>> -else
>> - efl_ui_scrollable_scroll_freeze_set(child,
>> EINA_FALSE);
>> +{
>> + if (elm_widget_is_legacy(obj))
>> + elm_interface_scrollable_freeze_set(child,
>> EINA_FALSE);
>> + else
>> + efl_ui_scrollable_scroll_freeze_set(child,
>> EINA_FALSE);
>> +}
>> }
>>}
>> }
>>
>> --
>>
>>
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourc
Re: [E-devel] evisum-0.1.0 release
As normal, impossible to test on every setup. But thanks to our IRC community have fixed some small issues (mainly packaging). https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.1.tar.xz On Mon, Jun 18, 2018 at 4:46 AM, Hermet Park wrote: > good job > > On Sun, Jun 17, 2018 at 10:08 PM, Al Poole wrote: > >> https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.0.tar.xz >> >> A better URL. >> >> On Sun, Jun 17, 2018 at 9:38 AM, Al Poole wrote: >> > Hi all, >> > >> > This is a process monitor and system monitor. I really designed it to >> > look good with the upcoming flat theme, though it's not so bad with >> > dark! :) >> > >> > Currently have full engines for Linux, FreeBSD, OpenBSD and MacOS. >> > >> > http://bogosys.org/downloads/evisum-0.1.0.tgz >> > >> > SHA256: >> > >> > 9358867cac936ab4249866acea1347201ba0d0777b5462166a0bf1db6130bfb6 >> > evisum-0.1.0.tgz >> > >> > >> > Evisum 0.1.0 >> > >> > >> > Features: >> > >> > * Full support across Linux, MacOS, FreeBSD and OpenBSD. >> > * Process Listing. >> > * Single-process view. >> > * Start/stop/kill individual process. >> > * Process PID, UID, name, thread count, memory use, nice, priority, >> > state, CPU ID and CPU usage. >> > * CPU monitoring. >> > * Memory monitoring. >> > * Disk usage monitoring. >> > * Network usage monitoring. >> > * CPU temperature monitoring. >> > * Battery and power status. >> > >> > Apostolos Bartziokas for his great icon. >> > >> > It's a start anyway. >> > >> > Hope you enjoy. Thanks all! >> > >> > Alastair (netstar) >> >> >> -- >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > > > > -- > Regards, Hermet > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] evisum-0.1.0 release
https://download.enlightenment.org/rel/apps/evisum/evisum-0.1.0.tar.xz A better URL. On Sun, Jun 17, 2018 at 9:38 AM, Al Poole wrote: > Hi all, > > This is a process monitor and system monitor. I really designed it to > look good with the upcoming flat theme, though it's not so bad with > dark! :) > > Currently have full engines for Linux, FreeBSD, OpenBSD and MacOS. > > http://bogosys.org/downloads/evisum-0.1.0.tgz > > SHA256: > > 9358867cac936ab4249866acea1347201ba0d0777b5462166a0bf1db6130bfb6 > evisum-0.1.0.tgz > > > Evisum 0.1.0 > > > Features: > > * Full support across Linux, MacOS, FreeBSD and OpenBSD. > * Process Listing. > * Single-process view. > * Start/stop/kill individual process. > * Process PID, UID, name, thread count, memory use, nice, priority, > state, CPU ID and CPU usage. > * CPU monitoring. > * Memory monitoring. > * Disk usage monitoring. > * Network usage monitoring. > * CPU temperature monitoring. > * Battery and power status. > > Apostolos Bartziokas for his great icon. > > It's a start anyway. > > Hope you enjoy. Thanks all! > > Alastair (netstar) -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] evisum-0.1.0 release
Hi all, This is a process monitor and system monitor. I really designed it to look good with the upcoming flat theme, though it's not so bad with dark! :) Currently have full engines for Linux, FreeBSD, OpenBSD and MacOS. http://bogosys.org/downloads/evisum-0.1.0.tgz SHA256: 9358867cac936ab4249866acea1347201ba0d0777b5462166a0bf1db6130bfb6 evisum-0.1.0.tgz Evisum 0.1.0 Features: * Full support across Linux, MacOS, FreeBSD and OpenBSD. * Process Listing. * Single-process view. * Start/stop/kill individual process. * Process PID, UID, name, thread count, memory use, nice, priority, state, CPU ID and CPU usage. * CPU monitoring. * Memory monitoring. * Disk usage monitoring. * Network usage monitoring. * CPU temperature monitoring. * Battery and power status. Apostolos Bartziokas for his great icon. It's a start anyway. Hope you enjoy. Thanks all! Alastair (netstar) -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Community Stuff
Will do - thanks! On Mon, Jun 11, 2018 at 11:59 AM, Mike Blumenkrantz wrote: > Ask Xavi on IRC > > On Mon, Jun 11, 2018 at 6:56 AM Al Poole wrote: > >> Absolutely. >> >> Am not really sure where to start there. I've all the instructions etc >> ready, but it's definitely better if we host it. >> >> Can you advise? >> >> On Mon, Jun 11, 2018 at 11:18 AM, Mike Blumenkrantz >> wrote: >> > Neat, do you have any plans to update the documentation for BSD on the >> site? >> > >> > On Sat, Jun 9, 2018 at 3:27 PM Al Poole wrote: >> > >> >> Hi all, >> >> >> >> Always talked about doing an OpenBSD installer with the EFL/E stack. >> >> >> >> So I did one, and it works! >> >> >> >> If you're interested: >> >> >> >> http://bogosys.org/openbsd.html >> >> >> >> Should install on all amd64 machines (EFI/MBR). If you choose to >> >> enable xdm E will be the WM of choice, and if not, startx and E will >> >> be the WM of choice. >> >> >> >> >> >> >> -- >> >> Check out the vibrant tech community on one of the world's most >> >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >> ___ >> >> enlightenment-devel mailing list >> >> enlightenment-devel@lists.sourceforge.net >> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >> >> > >> -- >> > Check out the vibrant tech community on one of the world's most >> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> > ___ >> > enlightenment-devel mailing list >> > enlightenment-devel@lists.sourceforge.net >> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >> >> -- >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Community Stuff
Absolutely. Am not really sure where to start there. I've all the instructions etc ready, but it's definitely better if we host it. Can you advise? On Mon, Jun 11, 2018 at 11:18 AM, Mike Blumenkrantz wrote: > Neat, do you have any plans to update the documentation for BSD on the site? > > On Sat, Jun 9, 2018 at 3:27 PM Al Poole wrote: > >> Hi all, >> >> Always talked about doing an OpenBSD installer with the EFL/E stack. >> >> So I did one, and it works! >> >> If you're interested: >> >> http://bogosys.org/openbsd.html >> >> Should install on all amd64 machines (EFI/MBR). If you choose to >> enable xdm E will be the WM of choice, and if not, startx and E will >> be the WM of choice. >> >> >> -- >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Esysinfo
Hi all, ApBBB poked me about disk usage. So I've added disk usages too in an alternative tab. It seems to work everywhere. http://bogosys.org/images/evisum2.png - a SS with the new flat theme on OpenBSD (hence the trillion mount points). Will probably consider doing a 0.1 point release soon, so if you've any complaints please keep them to yourself! (kidding!) On Thu, Jun 7, 2018 at 2:48 AM, Hermet Park wrote: > [thumbs up!] > > On Wed, Jun 6, 2018 at 12:21 AM, Al Poole wrote: > >> Mike has done that, cheers! >> >> Slight naming contradiction. Now named "evisum" >> >> https://git.enlightenment.org/apps/evisum.git >> >> On Tue, Jun 5, 2018 at 10:57 AM, Al Poole wrote: >> > Okay :) >> > >> > On Tue, Jun 5, 2018 at 3:26 AM, Hermet Park >> wrote: >> >> Nice work. push it in efl/apps! >> >> >> >> On Mon, Jun 4, 2018 at 10:55 PM, Vincent Torri > > >> >> wrote: >> >> >> >>> and now, the Windows port ! >> >>> >> >>> On Mon, Jun 4, 2018 at 2:46 PM, Marcel Hollerbach >> wrote: >> >>> > Lovely! :) >> >>> > >> >>> > >> >>> > On 06/04/2018 02:31 PM, Jérémy Zurcher wrote: >> >>> >> >> >>> >> hats off, it's very nice !! >> >>> >> >> >>> >> On Monday 04 June 2018 12:06, Al Poole wrote : >> >>> >>> >> >>> >>> Hi all, >> >>> >>> >> >>> >>> I've been working on a system monitor. >> >>> >>> >> >>> >>> https://git.enlightenment.org/devs/netstar/esysinfo.git >> >>> >>> >> >>> >>> http://haxlab.org/images/esysinfo.png - screenshot >> >>> >>> >> >>> >>> Working with Linux, MacOS, FreeBSD and OpenBSD. >> >>> >>> >> >>> >>> I hope you can enjoy! It's a start and would be very happy for >> anyone >> >>> >>> to contribute. >> >>> >>> >> >>> >>> Thanks guys! >> >>> >>> >> >>> >>> Alastair (netstar) >> >>> >>> >> >>> >>> >> >>> >>> >> >>> -- >> >>> >>> Check out the vibrant tech community on one of the world's most >> >>> >>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >>> >>> ___ >> >>> >>> enlightenment-devel mailing list >> >>> >>> enlightenment-devel@lists.sourceforge.net >> >>> >>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >>> >> >> >>> >> --- Hell'O from Yverdoom >> >>> >> >> >>> >> Jérémy (jeyzu) >> >>> >> >> >>> >> >> >>> >> >> >>> -- >> >>> >> Check out the vibrant tech community on one of the world's most >> >>> >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >>> >> ___ >> >>> >> enlightenment-devel mailing list >> >>> >> enlightenment-devel@lists.sourceforge.net >> >>> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >>> >> >> >>> > >> >>> > >> >>> -- >> >>> > Check out the vibrant tech community on one of the world's most >> >>> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >>> > ___ >> >>> > enlightenment-devel mailing list >> >>> > enlightenment-devel@lists.sourceforge.net >> >>> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >>> >> >>> >> >>> -- >> >>> Check out the vibrant tech community on
[E-devel] Community Stuff
Hi all, Always talked about doing an OpenBSD installer with the EFL/E stack. So I did one, and it works! If you're interested: http://bogosys.org/openbsd.html Should install on all amd64 machines (EFI/MBR). If you choose to enable xdm E will be the WM of choice, and if not, startx and E will be the WM of choice. -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] EFL Freeze
This all sounds very positive and reasonable. On Fri, Jun 8, 2018 at 5:44 PM, Christopher Michael wrote: > On 06/08/2018 11:17 AM, Mike Blumenkrantz wrote: >> >> Hello, >> >> Stefan is off for this entire month, so let's try organizing the release a >> bit while he's gone! >> >> We had previously agreed to start the freeze "after Cedric's branches >> merged". That branch was merged some time ago, and it seems we are already >> in bug fixing mode. >> >> After speaking a bit with bu5hm4n/Marcel, who has been handling a lot of >> the bug fixing, I propose the following: >> >> * We consider the freeze to have started as of last Friday (1 June 2018), >> and proceed from there. >> * During the freeze period, all newly-submitted features (ie. anything >> submitted on or after the freeze start date) must go through patch review >> and receive 2+ approvals from core developers; if employed by Samsung, the >> developers must not work for the same office. > > > I was under the impression that one of the points of a freeze is that no new > features could be added and we can focus on bug fixes. Your mention of > newly-submitted features "after the freeze start date" is a little > misleading > >> * Feature patches submitted prior to the freeze date which are still under >> review and have received review comments prior to the freeze date can be >> merged/landed through normal patch review. >> >> Marcel has also been working on improvements to our bug handling workflow >> which will be explained in a forthcoming mail. I believe that these >> methods >> should enable us to be in a good position to execute a release on or near >> the time of Stefan's return. >> >> If nobody disagrees with the basic premise of beginning the freeze, >> https://phab.enlightenment.org/T6926 is a great place to start looking for >> things to work on. >> > > No disagreements here. > > Cheers, > Chris > > >> >> regards, >> >> Mike > > > > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Esysinfo
Mike has done that, cheers! Slight naming contradiction. Now named "evisum" https://git.enlightenment.org/apps/evisum.git On Tue, Jun 5, 2018 at 10:57 AM, Al Poole wrote: > Okay :) > > On Tue, Jun 5, 2018 at 3:26 AM, Hermet Park wrote: >> Nice work. push it in efl/apps! >> >> On Mon, Jun 4, 2018 at 10:55 PM, Vincent Torri >> wrote: >> >>> and now, the Windows port ! >>> >>> On Mon, Jun 4, 2018 at 2:46 PM, Marcel Hollerbach wrote: >>> > Lovely! :) >>> > >>> > >>> > On 06/04/2018 02:31 PM, Jérémy Zurcher wrote: >>> >> >>> >> hats off, it's very nice !! >>> >> >>> >> On Monday 04 June 2018 12:06, Al Poole wrote : >>> >>> >>> >>> Hi all, >>> >>> >>> >>> I've been working on a system monitor. >>> >>> >>> >>> https://git.enlightenment.org/devs/netstar/esysinfo.git >>> >>> >>> >>> http://haxlab.org/images/esysinfo.png - screenshot >>> >>> >>> >>> Working with Linux, MacOS, FreeBSD and OpenBSD. >>> >>> >>> >>> I hope you can enjoy! It's a start and would be very happy for anyone >>> >>> to contribute. >>> >>> >>> >>> Thanks guys! >>> >>> >>> >>> Alastair (netstar) >>> >>> >>> >>> >>> >>> >>> -- >>> >>> Check out the vibrant tech community on one of the world's most >>> >>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >>> >>> ___ >>> >>> enlightenment-devel mailing list >>> >>> enlightenment-devel@lists.sourceforge.net >>> >>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >>> >> >>> >> --- Hell'O from Yverdoom >>> >> >>> >> Jérémy (jeyzu) >>> >> >>> >> >>> >> >>> -- >>> >> Check out the vibrant tech community on one of the world's most >>> >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >>> >> ___ >>> >> enlightenment-devel mailing list >>> >> enlightenment-devel@lists.sourceforge.net >>> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >>> >> >>> > >>> > >>> -- >>> > Check out the vibrant tech community on one of the world's most >>> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot >>> > ___ >>> > enlightenment-devel mailing list >>> > enlightenment-devel@lists.sourceforge.net >>> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >>> >>> >>> -- >>> Check out the vibrant tech community on one of the world's most >>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >>> ___ >>> enlightenment-devel mailing list >>> enlightenment-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >>> >> >> >> >> -- >> Regards, Hermet >> -- >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Esysinfo
Okay :) On Tue, Jun 5, 2018 at 3:26 AM, Hermet Park wrote: > Nice work. push it in efl/apps! > > On Mon, Jun 4, 2018 at 10:55 PM, Vincent Torri > wrote: > >> and now, the Windows port ! >> >> On Mon, Jun 4, 2018 at 2:46 PM, Marcel Hollerbach wrote: >> > Lovely! :) >> > >> > >> > On 06/04/2018 02:31 PM, Jérémy Zurcher wrote: >> >> >> >> hats off, it's very nice !! >> >> >> >> On Monday 04 June 2018 12:06, Al Poole wrote : >> >>> >> >>> Hi all, >> >>> >> >>> I've been working on a system monitor. >> >>> >> >>> https://git.enlightenment.org/devs/netstar/esysinfo.git >> >>> >> >>> http://haxlab.org/images/esysinfo.png - screenshot >> >>> >> >>> Working with Linux, MacOS, FreeBSD and OpenBSD. >> >>> >> >>> I hope you can enjoy! It's a start and would be very happy for anyone >> >>> to contribute. >> >>> >> >>> Thanks guys! >> >>> >> >>> Alastair (netstar) >> >>> >> >>> >> >>> >> -- >> >>> Check out the vibrant tech community on one of the world's most >> >>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >>> ___ >> >>> enlightenment-devel mailing list >> >>> enlightenment-devel@lists.sourceforge.net >> >>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >> >> >> --- Hell'O from Yverdoom >> >> >> >> Jérémy (jeyzu) >> >> >> >> >> >> >> -- >> >> Check out the vibrant tech community on one of the world's most >> >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> >> ___ >> >> enlightenment-devel mailing list >> >> enlightenment-devel@lists.sourceforge.net >> >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >> >> > >> > >> -- >> > Check out the vibrant tech community on one of the world's most >> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> > ___ >> > enlightenment-devel mailing list >> > enlightenment-devel@lists.sourceforge.net >> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> >> >> -- >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > > > > -- > Regards, Hermet > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Esysinfo
Hi all, I've been working on a system monitor. https://git.enlightenment.org/devs/netstar/esysinfo.git http://haxlab.org/images/esysinfo.png - screenshot Working with Linux, MacOS, FreeBSD and OpenBSD. I hope you can enjoy! It's a start and would be very happy for anyone to contribute. Thanks guys! Alastair (netstar) -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Some positive news
That's really great to see Simon! :) On Fri, Jun 1, 2018 at 10:53 AM, Hermet Park wrote: > oh yes, they asked me about e-photo, some build issues. :) > > On Fri, Jun 1, 2018 at 6:51 PM, Hermet Park wrote: > >> yup. even I found out e users last year when I attended in some local >> conferences in China Shanghai. :) >> >> On Fri, Jun 1, 2018 at 6:35 PM, Simon Lees wrote: >> >>> Hi all, >>> >>> As there has been much discouragement and negativity on these lists over >>> the last while and suggestions that enlightenment has very few users >>> these days, so I thought i'd post a positive counter example. >>> >>> One of the quirks of open source software is that you often really have >>> no idea who is using your software and for what until you stumble upon >>> someone actually using it. I was watching a GNU Health talk at the >>> openSUSE conference last week and was slightly surprised when the >>> screenshot of there raspberry pi image showed them running enlightenment >>> [1], so enlightenment is helping sick people across Africa without even >>> knowing it. >>> >>> So everyone keep up the good work because it is helping someone >>> somewhere even if you don't realise it >>> >>> >>> 1. https://pbs.twimg.com/media/C6el5o8XMAAwziN.jpg >>> >>> -- >>> >>> Simon Lees (Simotek)http://simotek.net >>> >>> Emergency Update Team keybase.io/simotek >>> SUSE Linux Adelaide Australia, UTC+10:30 >>> GPG Fingerprint: 5B87 DB9D 88DC F606 E489 CEC5 0922 C246 02F0 014B >>> >>> >>> >>> -- >>> Check out the vibrant tech community on one of the world's most >>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >>> ___ >>> enlightenment-devel mailing list >>> enlightenment-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >>> >>> >> >> >> -- >> Regards, Hermet >> > > > > -- > Regards, Hermet > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] latest efl lifecycle commits (from cedric)
I don't think anyone thinks that. Maybe we're looking at the "bigger" picture too much (the big goal), This whole interfaces work has been a long slog for most people involved. I think overall things are improving. It seems simple advice, just have to keep going. On Thu, May 31, 2018 at 8:55 PM, Stephen Houston wrote: > If the take away anyone gets from this is that everyone hates raster or > raster should quit, then you are missing the point. > > On Thu, May 31, 2018 at 2:48 PM Vincent Torri > wrote: > >> I am very sad about how behaviors are these days. >> >> But i would like to recall that, whatever you think about raster, >> whatever has been said behind the scene, he is the one who started >> everything, the EFL and E. >> >> Vincent >> >> On Thu, May 31, 2018 at 6:01 PM, William L. Thomson Jr. >> wrote: >> > Carsten, >> > >> > On Fri, 1 Jun 2018 00:24:24 +0900 >> > Carsten Haitzler (The Rasterman) wrote: >> > >> >> i'm ->||<- that close to quitting this e/efl myself. >> > >> > Never do that >> > >> >> what i have seen over the past few months is "bugger off raster - we >> >> don't want you". i'm sorely tempted to make you happy. it'll make me >> >> oh so much less stressed. i'm going to be away for about 2 weeks... i >> >> vaguely feel like not coming back given the kind of behaviour that is >> >> "let's make stuff up to make him look bad and while i'm at it call >> >> him a despot". >> > >> > This seems quite similar to when Gentoo community got Daniel Robbins to >> > give up his BDFL over Gentoo Technologies, Inc.. Then creating the >> > absolute mess that is Gentoo Foundation. Inc. Which of course Daniel >> > Robbins left and people were happy without him... FAIL >> > >> > Things have only gotten worse Let Daniel Robbins and Gentoo be an >> > example for Carsten and E/EFL. Please do not make that mistake again!!! >> > >> > I have never met Daniel. I do not condone all his conducts, or support >> > all his ideas. That is not my place. But I respect what he started and >> > did. No matter who has done more since. For all the respect shown to >> > Cedric for his work. Same should go to Carsten for starting this >> > project, and continuing to participate. Many start something and bail. >> > >> > Any one individual or group can always move on. Some have already like >> > Bohdi Linux. If you don't like Carsten etc, you always have the choice >> > of fork etc. Re-create what he started. That stuff is not trivial!!! >> > >> > I also have my own issues with Carsten, as I am sure he does with me. I >> > just look past that stuff. It is life... >> > >> > I am shocked no one has ever had a boss, teacher, or someone above them >> > they disliked. I guess they quit or something... >> > >> > -- >> > William L. Thomson Jr. >> > >> > >> -- >> > Check out the vibrant tech community on one of the world's most >> > engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> > ___ >> > enlightenment-devel mailing list >> > enlightenment-devel@lists.sourceforge.net >> > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > >> >> >> -- >> Check out the vibrant tech community on one of the world's most >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> ___ >> enlightenment-devel mailing list >> enlightenment-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel >> > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Enlightenement Break
Hi raster, The commit: 757f7a7279e97e80ccb4defa986c174daaf9449e Breaks module loading on FreeBSD. Lots of unresolved symbols when loading modules: E initialzation loops forever. I thought about reverting but perhaps you have the time to investigate the issue there? -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Heads up on upcoming 1.21 stabilization phase
Beautiful. On Thu, May 17, 2018 at 12:14 PM, Stefan Schmidt wrote: > Hello. > > Another update on this. > > On 08.05.2018 21:41, Stefan Schmidt wrote: > > > > On 04/27/2018 01:38 PM, Stefan Schmidt wrote: > > > > There sadly has not been as much progress as hoped for. > > I still wait for the following items: > > > > o Cedric's last branch to be merged (lifecycle?). What is the status > here? Maybe its to massive to get landed for 1.21? I have been told it > > would be merged like 10 days ago. > > This is the one getting me stomachache. It keeps postponing with new > problems being found. And surely there will be more problems showing up > when merged into master. > > Cedric, you think you can get this in until Tuesday? I wanted to start > the freeze end of next week, more below. > > > o https://phab.enlightenment.org/D5908 needs review > > Merged now. > > > o https://phab.enlightenment.org/D6046 needs review > > Still in progress. Raster, could you check if the added comment > addressed your concern? > > > o Comments on the flat theme from Raster > > We talked about it again and this will keep going in parallel with the > hopes to have it ready and merged into master before the release. I am > willing to have an exception here as the theme should be isolated enough > to not cause to much trouble when being merged late. We still should > make a call if we have it in or not two weeks before the release (beta2 > time). > > > Once we have these sorted we can start with the stabilization phase. > > As we have no date for this yet I can only give a rough schedule to give > people an idea. > > This needs to be updated once we start with the alpha. > > Besides the lifecycle branch I think we are in shape now to start the > stabilization. Nothing else besides the ones above have been brought up. > > It seems time to get into the huge backlog of bugs to get them fixed. :-) > > The idea is now to have the freeze starting end of next week. The items > from above have been mentioned early enough that I might be ok to have > them slip in after the alpha, but don't count on it. Instead try to make > sure you get them in until Monday or Tuesday. > > Here is an updated schedule I put up for discussion. Speak up NOW if you > have problems with it. > > === Schedule === > 2018-05-24 Merge window is over. (handled by Stefan) > * Only bug fixes from this point > * Alpha release tarball > * We really need to sort out if we have bigger issues lingering around > due to all the last minute rush > 2018-06-18 Beta1 release tarball (handled by Raster) > * Only critical fixes from this point > 2018-06-25 Beta2 release tarball (handled by Raster) > 2018-07-02 Beta3 release tarball (handled by Raster) > 2018-07-09 EFL 1.21 is out (handled by Stefan) > > This would basically bring it down to a 6 weeks stabilization window. > > Thoughts? > > regards > Stefan Schmidt > > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Let's get Terminology 1.2.0 out!
Hi Boris, I found if you right-click to start bringing up the menu then left click to cancel it mid animation it causes problems. Do you also see this? On Tue, Apr 10, 2018 at 9:58 PM, Boris Faure wrote: > On 18-04-10 11:56, Michał Butterweck wrote: > >Hi, > >Not much annoying. Clicking right mouse and "New" button - it opens a > >new tab with path set in the home directory. But the setting is to > open > >in current directory. > >Bests, Michal Butterweck > > I've fixed this one and uploaded a new tarball. Please test it :) > -- > Boris Faure > Pointer Arithmetician > > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Theming E
Hi all, I want to make a very simple proposition. Can we return Enlightenment's theming specific to E itself and have elementary theming handled separately. Or the choice of the two when setting themes. The argument against this is for a uniform look between applications and the desktop. I don't think this is so important given the scope of existing applications and also the target plaforms (including Windows and MacOS). I don't think it's a necessity to bind E to ELM look. This would make theming the desktop a much less arduous task. Thanks -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] GPL icons in theme
Worst scenario we could pay the author??? On Wed, Jan 31, 2018 at 1:36 PM, Davide Andreoli wrote: > 2018-01-31 10:52 GMT+01:00 Carsten Haitzler : > >> On Wed, 31 Jan 2018 14:37:28 +1030 Simon Lees said: >> >> > >> > >> > On 31/01/18 10:39, Davide Andreoli wrote: >> > > The fdo icons in the efl theme are indeed GPL3, >> > > as clearly staten in COPYING.images and data/elementary/themes/fdo >> > > >> > > I have no idea about the contamination and the resulting theme final >> > > license. >> > > >> > > For sure I want (and we must) them to remain to that license. >> > > >> > >> > I don't understand why you wouldn't want them licensed under an >> > equivalent creative commons license rather then GPL-3, GPL-3 is designed >> > for source code where as creative commons is designed for images, using >> > the wrong sort of licenses leads to the ambiguities we are seeing here, >> > if we can't convince the upstream developers to change there isn't much >> > we can do but its worth trying. >> >> we need to probably replace them with icons that are not licensed like the >> above. >> >> as for contamination, that is generally considered to be true with code if >> they >> share the same memory space. icons on the other hand do not. they are first >> decoded/rendered then manipulated. code from the binary is mapped directly >> into >> memory as-is pretty much minus relocation. >> >> so while i don't think DATA files would leak their license to efl, gplv3 >> does >> create requirements of its host system (to allow any gplv3 components to be >> replaceable by the end user) and that requires any system that would ship >> these >> to not be locked down. that is generally disliked by commercial vendors. >> >> so my take is "replace them". i could replace them anyway if the theme >> fundamentally changed (e.g. became flat). >> > > Did you see how many fdo icons are there? I don't think we have the manpower > to redesign all of them. > > >> >> > > >> > > 2018-01-30 14:05 GMT+01:00 Jean-Philippe André : >> > > >> > >> On Tue, Jan 30, 2018 at 9:30 PM, Simon Lees wrote: >> > >> >> > >>> >> > >>> >> > >>> On 30/01/18 22:20, Jean-Philippe André wrote: >> > Hi, >> > >> > Sungtaek pointed out to me that we have GPLv3-licensed artworks >> (unsual >> > >>> for >> > images) in our theme, under data/elementary/theme/fdo. Those images >> are >> > >>> are >> > then included in the compiled theme default.edj. One source is >> clearly >> > GPLv3: >> > https://tiheum.deviantart.com/art/Faenza-Icons-173323228 >> > >> > Now I wonder what the implications of this are... >> > 1. Does Elementary become GPL because we load the theme and it >> contains >> > executable code (embryo & edje programs), so the theme is to be >> > >>> considered >> > a library, contaminating everything?? >> > 2. Or only the theme itself is GPL, by contamination from those >> images? >> > 3. Or is the compiled theme file not GPL because we're not linking >> or >> > derivating, merely archiving those images like in a Zip file, in >> which >> > >>> case >> > only what's in the tree is GPL? This would be same as HTML: >> > https://news.slashdot.org/story/13/06/26/2113242/when- >> > >>> gpl-becomes-almost-gpl-the-css-images-and-javascript- >> > >>> loophole/informative-comments#comments >> > >> > In the FAQ I only found a mention about fonts: >> > https://www.gnu.org/licenses/gpl-faq.en.html#FontException >> > We don't have such an exception. >> > >> > Pretty sure there is no problem (i.e. #3 is right), but IANAL so I'd >> > >>> rather >> > ask away :) >> > >> > >>> >> > >>> Licence wise i've always considered themes to be separate, whether >> that >> > >>> is correct or not is another question. GPL with images is silly >> anyway >> > >>> and we really should be asking upstream to relicense with some form >> of >> > >>> creative commons anyway which makes far more sense, but I guess the >> > >>> theme is probably technically GPL-3 as a binary. >> > >> >> > >> >> > >> Not so sure. HTML seems to be a crazy exception: An HTML file >> containing >> > >> GPL licensed JS code is not GPL itself. Not consistent but makes >> sense. EDJ >> > >> probably also falls under the category of "container". >> > >> >> > >> >> > >>> Probably the biggest actual real life issue is if the theme is being >> > >>> used in consumer devices such as tizen you would need to provide >> > >>> consumers a way to swap there stock theme for one of there choice. >> > >>> >> > >> >> > >> Yeah that's partly why I'm asking. :) >> > >> >> > >> -- >> > >> Jean-Philippe André >> > >> >> > >> -- >> > >> Check out the vibrant tech community on one of the world's most >> > >> engaging tech sites, Slashdot.org! http://sdm.link/slashdot >> > >> ___ >> > >> enlightenment-devel m
Re: [E-devel] What are we going to release?
This is my proposal: 1. Move interfaces into a 2.0 branch. 2. Leave major developers working on interfaces in 2.0. 3. Minor devs to work on legacy code fixes, minor features and backports (1.2x) 4. Major devs, one per week, to spend a day helping on legacy EFL. This shouldn't' slow down interfaces development too much, also legacy isn't waiting for interfaces to catch up for important changes and fixes. Perhaps new but competent EFL developers could work on the legacy code, whereas long-time engineers work solely on interfaces in 2.0 branch. Legacy requesting that with each week can borrow one developer for one whole day from the 2.0 branch. e.g. jpeg or raster... Thus we can work towards an improved EFL 1.x release and continue strongly with interfaces development as the main focus for our stronger engineers. On Thu, Dec 7, 2017 at 1:45 PM, Andrew Williams wrote: > Why does it have to be black and white? releasing does not "guarantee no > changes", it probably does need to guarantee backward compatibility. The > challenge I see with our current situation is that we have published "beta" > which is not even close to stable and now don't have a clear next step to > get people involved. A "release candidate" might be an obvious step which > comes as part of a release plan, which is what I wanted to discuss. > > I think that EFL and our community is in a different place to where it was > years before ecore. We should learn from (everyone's) experience and figure > how to apply that to our current situation. Our current reality is that > companies with real products want to build on what we have. That's pretty > exciting I reckon. > > Until we have a release of the new API that people can actually start > relying on being somewhat stable we are expecting them to use only the old > API. In the meantime we have most active development on it's replacement. > We are basically saying "you can use the old stuff, but you'll need to port > later - or you can try and use the new stuff, which requires regular > updating to keep up". To me this looks like there is no practical way that > we can encourage new people to rely on EFL. This makes me sad. > > Should we instead figure when we might start releasing and set an > expectation to the public? Something like "come back in 2019"? > > Andrew > > On Thu, 7 Dec 2017 at 10:37 Carsten Haitzler wrote: > > > On Thu, 07 Dec 2017 08:54:05 + Andrew Williams > > > said: > > > > so what applications can you build only with efl core and efl net and > > nothing > > else? > > > > zero applications will be built with these. it will not be tested. > history > > tells > > me so. BUT it will tie our hands in making changes. so what value does > this > > provide? none to any developers who know that the api is STILL unstable > and > > changes might be made, unless we guarantee NONE will be... and then if > > NONE are > > broken, our hands are tied. > > > > i'm speaking from experience here. i made eet 1.0 long (years) before > > ecore, > > evas, etc. etc. ... and people didn't go using it. been there. done that. > > and > > by the time the others were ready i was already going "crap - i shouldn't > > have > > done that" because eet had to hold legacy file format support (and still > > does) > > that was deprecated already in efl before edje 1.0 was done. > > > > what we have now i think is the best we can do. > > > > > Hi, > > > > > > To say that it is publicly available behind a BETA flag is one thing, > but > > > to call it a Beta Release is quite a stretch. To reference The Next > > > Generation Lexicon: "Beta phase generally begins when the software is > > > feature complete but likely to contain a number of known or unknown > > bugs.". > > > Given the current state of the interfaces I would say that to treat it > > like > > > that is exceptionally generous. I have never been anywhere where the > > > developers or users have been told "It's in beta - the APIs will > change - > > > we don't care" which is common parlance around here. > > > > > > I think it's unfair to say that releasing a subset has "no value". The > > APIs > > > described allow you to build a complete application - albeit without a > > > graphical front end - which is a great start, even a solid foundation. > > With > > > a little more work we could have Efl.Canvas and Efl.Gfx in there to get > > > early access to the new graphical APIs. It seems that Efl.Ui is sinking > > the > > > most time and we are having to rewrite areas of it as the underlying > > > libraries change. Surely nailing the underpinnings and releasing them > > gives > > > us a stable platform to deliver on. > > > > > > Calling for release discussions seems required to focus us. As everyone > > > acknowledges we are a team spread very thin and if we continue to have > > > little or no direction for release we will continue to work on what is > > > interesting and not to wrap up an API that is actually usable and > > rel
Re: [E-devel] FOSDEM
I can pay On Wed, Nov 22, 2017 at 6:02 PM, Andrew Williams wrote: > Hi, > > The supplier I work with does not do embroidery. > Does anyone who will be attending Fosdem have the ability to get a full > shirt with stitching organised? > > If not should I go ahead with a t-shirt or do folk feel strongly that it is > not suitable for us? > > Thanks, > Andy > > p.s. still wondering if folk would pay for their own shirt or if I need to > get sponsorship for this? > > On Thu, 9 Nov 2017 at 00:24 Carsten Haitzler wrote: > > > On Wed, 08 Nov 2017 22:05:07 + Andrew Williams > > > said: > > > > > Hi, > > > > > > I reckon stickers are a minimum :) not sure if we can afford more than > > that > > > to give away. > > > > > > I also wondered if we should get some new t-shirts - not to give away > but > > > for a little branding and visibility. Would folk be willing to pay for > > > their own shirt? > > > > > > I was wondering about “Enlightenment” (with logo) on the front and > maybe > > > “built on EFL” on the back :) > > > > Can we do more stylish than a t-shirt? Like... A proper collared shirt > > maybe > > with the logo embroidered? grey/black with white embroidery? :) > > > > > Looking forward to it, > > > Andy > > > On Mon, 23 Oct 2017 at 14:31, Philippe Caseiro > > wrote: > > > > > > > Hi !! > > > > > > > >Stand request posted ! > > > > > > > >Now, I will work on some goodies ! > > > > > > > >Some ideas or proposals ? > > > > > > > > Regards > > > > > > > > Le mercredi 11 octobre 2017 14:51:03 CEST, Philippe Caseiro a écrit : > > > > > Le mercredi 11 octobre 2017 13:19:42 CEST, Andrew Williams a écrit > : > > > > >> Hi, > > > > >> > > > > >> Good shout! I think I could make it this year and would be happy > to > > help > > > > >> with the stand and/or put forward a talk (probably around edi > > > > >> ;) or getting > > > > >> into efl). > > > > > > > > > > Great ! > > > > > > > > > >> > > > > >> One proviso: we would have to do it properly - some fixed > > > > >> demos, a story to > > > > >> tell and probably some stickers too... > > > > >> > > > > >> An empty table with a name behind us made me sad :( > > > > > > > > > > Yes me to this year we will try to have a nice stand ! > > > > > > > > > > > > > > > > > > -- > > > > Philippe Caseiro > > > > > > > > Responsable Cadoles Services & Solutions > > > > Ingénieur logiciels libres > > > > > > > > https://www.cadoles.com > > > > > > > > > > > > > > > > > > > -- > > > > Check out the vibrant tech community on one of the world's most > > > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > > > ___ > > > > enlightenment-devel mailing list > > > > enlightenment-devel@lists.sourceforge.net > > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > > -- > > > http://andywilliams.me > > > http://ajwillia.ms > > > > > > -- > > > Check out the vibrant tech community on one of the world's most > > > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > > > ___ > > > enlightenment-devel mailing list > > > enlightenment-devel@lists.sourceforge.net > > > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > > > > -- > > - Codito, ergo sum - "I code, therefore I am" -- > > Carsten Haitzler - ras...@rasterman.com > > > > -- > http://andywilliams.me > http://ajwillia.ms > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] E Phab Organization
great :) On Fri, Nov 3, 2017 at 11:48 AM, Mike Blumenkrantz < michael.blumenkra...@gmail.com> wrote: > I've created some subprojects for the enlightenment-git project: > > https://phab.enlightenment.org/project/subprojects/4/ > > Currently this amounts to core, filemanager, gadgets, and settings. It > should allow tickets to be more easily categorized and for people to more > easily associate with specific components that they have interest in. > > I've also added 3 new base projects: easy, difficult, impossible. These > have no code-based project associated, and exist solely for tagging tasks. > This should enable new developers or developers looking to expand into new > projects to more easily determine which tasks they are able to effectively > take on. > > -- > Check out the vibrant tech community on one of the world's most > engaging tech sites, Slashdot.org! http://sdm.link/slashdot > ___ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > -- Check out the vibrant tech community on one of the world's most engaging tech sites, Slashdot.org! http://sdm.link/slashdot ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/edi] master 01/01: replace: fix a typo.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=49f1d1a53d38fee63d980933d4ae221364b608f6
commit 49f1d1a53d38fee63d980933d4ae221364b608f6
Author: Al Poole
Date: Tue Oct 10 23:40:52 2017 +0100
replace: fix a typo.
---
src/bin/mainview/edi_mainview.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 34a9ec9..febe703 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -714,7 +714,7 @@ edi_mainview_project_replace_popup_show(void)
Evas_Object *frame;
popup = elm_popup_add(_main_win);
_edi_mainview_search_project_popup = popup;
- elm_object_part_text_set(popup, "title,text", _("Search & Replace"));
+ elm_object_part_text_set(popup, "title,text", _("Search & Replace"));
box = elm_box_add(popup);
--
[EGIT] [tools/edi] master 01/01: mainview: Add support for split-panes.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=7a5083c79024a35a0aa651b88cfc35e48767eeb5
commit 7a5083c79024a35a0aa651b88cfc35e48767eeb5
Author: Al Poole
Date: Tue Oct 10 23:29:17 2017 +0100
mainview: Add support for split-panes.
This adds the ability to edit multiple regions of the same
file at the same time. The views are synchronised. This
also adds a complementary function allowing us to get panel
from path name. We use this for focus sanity with our
additional split views.
---
src/bin/edi_main.c| 8
src/bin/editor/edi_editor.c | 6 +++
src/bin/editor/edi_editor.h | 11 +
src/bin/mainview/edi_mainview.c | 77 +++
src/bin/mainview/edi_mainview.h | 18
src/bin/mainview/edi_mainview_panel.c | 14 ++-
6 files changed, 133 insertions(+), 1 deletion(-)
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index d8573f2..606b699 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -954,6 +954,13 @@ _edi_menu_view_open_window_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUS
}
static void
+_edi_menu_view_split_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+ edi_mainview_split_current();
+}
+
+static void
_edi_menu_view_new_panel_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
@@ -1165,6 +1172,7 @@ _edi_menu_setup(Evas_Object *win)
menu_it = elm_menu_item_add(menu, NULL, NULL, _("View"), NULL, NULL);
elm_menu_item_add(menu, menu_it, "window-new", _("New Window"),
_edi_menu_view_open_window_cb, NULL);
elm_menu_item_add(menu, menu_it, "object-flip-horizontal", _("New Panel"),
_edi_menu_view_new_panel_cb, NULL);
+ elm_menu_item_add(menu, menu_it, "object-flip-vertical", _("Split View"),
_edi_menu_view_split_cb, NULL);
elm_menu_item_separator_add(menu, menu_it);
elm_menu_item_add(menu, menu_it, "edit-find", _("Open Tasks"),
_edi_menu_view_tasks_cb, NULL);
diff --git a/src/bin/editor/edi_editor.c b/src/bin/editor/edi_editor.c
index 8e9004f..53f1b4d 100644
--- a/src/bin/editor/edi_editor.c
+++ b/src/bin/editor/edi_editor.c
@@ -1317,6 +1317,12 @@ _edi_editor_config_changed(void *data, int type
EINA_UNUSED, void *event EINA_UN
return ECORE_CALLBACK_RENEW;
}
+void
+edi_editor_widget_config_get(Elm_Code_Widget *widget)
+{
+ _edi_editor_config_changed(widget, 0, NULL);
+}
+
static void
_editor_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *o, void
*event_info EINA_UNUSED)
{
diff --git a/src/bin/editor/edi_editor.h b/src/bin/editor/edi_editor.h
index 71492d2..b0ab5ab 100644
--- a/src/bin/editor/edi_editor.h
+++ b/src/bin/editor/edi_editor.h
@@ -145,6 +145,17 @@ void edi_editor_save(Edi_Editor *editor);
void edi_editor_doc_open(Edi_Editor *editor);
/**
+ * Get global configuration values for code editor and
+ * apply them to an Elm_Code_Widget instance.
+ *
+ * @param widget The Elm_Code_Widget obj to update.
+ *
+ * @ingroup Widgets
+ */
+void edi_editor_widget_config_get(Elm_Code_Widget *widget);
+
+
+/**
* @}
*/
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index b1a25b1..34a9ec9 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -100,6 +100,27 @@ edi_mainview_panel_for_item_get(Edi_Mainview_Item *item)
return NULL;
}
+Edi_Mainview_Panel *
+edi_mainview_panel_for_path_get(const char *path)
+{
+ Eina_List *item;
+ Edi_Mainview_Panel *panel;
+ Edi_Mainview_Item *it;
+ int i;
+
+ for (i = 0; i < edi_mainview_panel_count(); i++)
+ {
+panel = edi_mainview_panel_by_index(i);
+EINA_LIST_FOREACH(panel->items, item, it)
+ {
+ if (it && !strcmp(it->path, path))
+ return panel;
+ }
+ }
+
+ return NULL;
+}
+
unsigned int
edi_mainview_panel_index_get(Edi_Mainview_Panel *panel)
{
@@ -259,6 +280,62 @@ edi_mainview_open_path(const char *path)
edi_mainview_panel_open_path(_current_panel, path);
}
+static void
+_focused_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Elm_Code *code;
+ const char *path;
+ Edi_Mainview_Panel *panel;
+ Edi_Editor *editor = data;
+
+ code = elm_code_widget_code_get(editor->entry);
+ path = elm_code_file_path_get(code->file);
+ panel = edi_mainview_panel_for_path_get(path);
+
+ edi_mainview_panel_focus(panel);
+}
+
+static void
+_changed_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Edi_Editor *editor = data;
+
+ editor->modified = EINA_TRUE;
+
+ ecore_event_add(EDI_EVENT_FILE_CHANGED, NULL, NULL, NULL);
+}
+
+void edi_mainview_split_cur
[EGIT] [tools/edi] edi-0.6 01/01: edi: escape paths where necessary.
netstar pushed a commit to branch edi-0.6.
http://git.enlightenment.org/tools/edi.git/commit/?id=d2220f12b4352657506628e371046b3afc7b12bc
commit d2220f12b4352657506628e371046b3afc7b12bc
Author: Al Poole
Date: Wed Sep 27 19:42:45 2017 +0100
edi: escape paths where necessary.
---
src/bin/edi_filepanel.c| 8 +++--
src/bin/screens/edi_file_screens.c | 20 ---
src/lib/edi_scm.c | 68 ++
src/lib/edi_scm.h | 1 +
4 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 91aca51..601881f 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -184,6 +184,7 @@ edi_filepanel_scm_status_update(void)
_file_status_item_add(status->fullpath, status->change);
eina_stringshare_del(status->path);
eina_stringshare_del(status->fullpath);
+ eina_stringshare_del(status->unescaped);
free(status);
}
eina_list_free(e->statuses);
@@ -609,7 +610,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
Edi_Dir_Data *sd = data;
Evas_Object *box, *lbox, *mbox, *rbox, *label, *ic;
Edi_Scm_Status_Code *code;
- char *text;
+ char *text, *escaped;
const char *icon_name, *icon_status;
Eina_Bool staged = EINA_FALSE;
@@ -618,10 +619,13 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
text = NULL; icon_name = icon_status = NULL;
- code = _file_status_item_find(sd->path);
+ escaped = ecore_file_escape_name(sd->path);
+ code = _file_status_item_find(escaped);
if (code)
icon_status = _icon_status(*code, &staged);
+ free(escaped);
+
text = strdup(basename((char *)sd->path));
provider = _get_provider_from_hashset(sd->path);
diff --git a/src/bin/screens/edi_file_screens.c
b/src/bin/screens/edi_file_screens.c
index ebe18a6..5e9233f 100644
--- a/src/bin/screens/edi_file_screens.c
+++ b/src/bin/screens/edi_file_screens.c
@@ -49,6 +49,7 @@ _edi_file_screens_create_file_cb(void *data,
void *event_info EINA_UNUSED)
{
const char *name;
+ char *text;
char *path;
const char *directory = _directory_path;
FILE *f;
@@ -63,7 +64,9 @@ _edi_file_screens_create_file_cb(void *data,
return;
}
- path = edi_path_append(directory, name);
+ text = elm_entry_markup_to_utf8(name);
+
+ path = edi_path_append(directory, text);
if ((ecore_file_exists(path) && ecore_file_is_dir(path)) ||
!ecore_file_exists(path))
{
@@ -82,6 +85,7 @@ _edi_file_screens_create_file_cb(void *data,
evas_object_del(_popup);
free(path);
+ free(text);
}
static void
@@ -90,7 +94,7 @@ _edi_file_screens_create_dir_cb(void *data,
void *event_info EINA_UNUSED)
{
const char *name;
- char *path;
+ char *path, *text;
const char *directory = _directory_path;
if (!ecore_file_is_dir(directory)) return;
@@ -102,7 +106,9 @@ _edi_file_screens_create_dir_cb(void *data,
return;
}
- path = edi_path_append(directory, name);
+ text = elm_entry_markup_to_utf8(name);
+
+ path = edi_path_append(directory, text);
mkdir(path, 0755);
@@ -111,6 +117,7 @@ _edi_file_screens_create_dir_cb(void *data,
evas_object_del(_popup_dir);
free(path);
+ free(text);
}
static void
@@ -120,7 +127,7 @@ _edi_file_screens_rename_cb(void *data,
{
Evas_Object *entry;
const char *name, *existing_path, *directory;
- char *path;
+ char *path, *text;
directory = _directory_path;
existing_path = (char *) data;
@@ -134,7 +141,9 @@ _edi_file_screens_rename_cb(void *data,
return;
}
- path = edi_path_append(directory, name);
+ text = elm_entry_markup_to_utf8(name);
+
+ path = edi_path_append(directory, text);
if (ecore_file_exists(path))
{
@@ -161,6 +170,7 @@ _edi_file_screens_rename_cb(void *data,
evas_object_del(_popup);
free(path);
+ free(text);
}
void
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index 56bea4b..466dd44 100644
--- a/src/lib/edi_scm.c
+++ b/src/lib/edi_scm.c
@@ -91,7 +91,7 @@ _edi_scm_git_file_add(const char *path)
int code;
Eina_Strbuf *command = eina_strbuf_new();
- eina_strbuf_append_printf(command, "git add '%s'", path);
+ eina_strbuf_append_printf(command, "git add %s", path);
code = _edi_scm_exec(eina_strbuf_string_get(command));
@@ -106,7 +106,7 @@ _edi_scm_git_file_mod(const char *path)
int code;
Eina_Strbuf *command = eina_strbuf_new();
- eina_strbuf_append_printf(command, "git mod '%s'", path);
+ eina_strbuf_append_printf(command, "git mod %s", path);
code = _edi_scm_exec(eina_strbuf_string_get(command));
@@ -136,7 +136
[EGIT] [tools/edi] master 01/01: edi_scm: fix use after free.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=53710764a9386dee5223fab1c06260706301d310
commit 53710764a9386dee5223fab1c06260706301d310
Author: Al Poole
Date: Sun Oct 8 14:57:46 2017 +0100
edi_scm: fix use after free.
---
src/bin/edi_scm_ui.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index 6d743c1..0e0f7d8 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -341,6 +341,9 @@ _edi_scm_ui_status_list_fill(Edi_Scm_Ui *edi_scm)
EINA_LIST_FOREACH(e->statuses, l, status)
{
+if (status->staged)
+ staged = EINA_TRUE;
+
if (edi_scm->results_max)
{
elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
@@ -352,9 +355,6 @@ _edi_scm_ui_status_list_fill(Edi_Scm_Ui *edi_scm)
else
_edi_scm_ui_status_free(status);
}
-
-if (status->staged)
- staged = EINA_TRUE;
}
if (e->statuses)
--
[EGIT] [tools/edi] master 01/01: libedi_scm: make sure we always change to valid directory.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=2a9d02fc2f58db3df7b693e3dc5014f1ed10d2c2 commit 2a9d02fc2f58db3df7b693e3dc5014f1ed10d2c2 Author: Al Poole Date: Sun Oct 8 14:44:34 2017 +0100 libedi_scm: make sure we always change to valid directory. --- src/lib/edi_scm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c index 3f5604b..592571a 100644 --- a/src/lib/edi_scm.c +++ b/src/lib/edi_scm.c @@ -27,7 +27,7 @@ _edi_scm_exec(const char *command) oldpwd = getcwd(NULL, PATH_MAX); - chdir(edi_project_get()); + chdir(self->workdir); code = edi_exe_wait(command); chdir(oldpwd); @@ -46,7 +46,7 @@ _edi_scm_exec_response(const char *command) oldpwd = getcwd(NULL, PATH_MAX); - chdir(edi_project_get()); + chdir(self->workdir); response = edi_exe_response(command); chdir(oldpwd); --
[EGIT] [tools/edi] master 01/01: edi_scm: sanitize titie.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=7ea3ce5d84672f7a4316ee9803b6d5c9d703823b
commit 7ea3ce5d84672f7a4316ee9803b6d5c9d703823b
Author: Al Poole
Date: Sun Oct 8 14:34:01 2017 +0100
edi_scm: sanitize titie.
This patch ensures a consistent window title when used
internally (in Edi) or externally. The title should
correspond to that Edi provides in its window title.
---
src/bin/edi_scm_main.c | 38 ++
src/bin/edi_scm_ui.c | 45 ++---
src/bin/edi_scm_ui.h | 1 +
src/lib/edi_scm.c | 3 ++-
4 files changed, 71 insertions(+), 16 deletions(-)
diff --git a/src/bin/edi_scm_main.c b/src/bin/edi_scm_main.c
index e1b77a9..419763d 100644
--- a/src/bin/edi_scm_main.c
+++ b/src/bin/edi_scm_main.c
@@ -1,8 +1,8 @@
#include
#include "edi_scm_ui.h"
-#define DEFAULT_WIDTH 460
-#define DEFAULT_HEIGHT 280
+#define DEFAULT_WIDTH 480
+#define DEFAULT_HEIGHT 240
static void
_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
@@ -11,21 +11,32 @@ _win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUS
ecore_main_loop_quit();
}
-static Evas_Object *
-_setup_win(void)
+static void
+_win_title_set(Evas_Object *win)
{
- Evas_Object *win, *icon;
Eina_Strbuf *title;
- char *cwd;
+ char *workdir;
- cwd = getcwd(NULL, PATH_MAX);
+ workdir = _edi_scm_ui_workdir_get();
+ if (!workdir)
+ workdir = getcwd(NULL, PATH_MAX);
title = eina_strbuf_new();
- eina_strbuf_append_printf(title, "Edi Source Control :: %s", cwd);
+ eina_strbuf_append_printf(title, "Edi Source Control :: %s", workdir);
+ elm_win_title_set(win, eina_strbuf_string_get(title));
+ eina_strbuf_free(title);
+
+ free(workdir);
+}
+
+static Evas_Object *
+_win_add(void)
+{
+ Evas_Object *win, *icon;
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_util_standard_add(eina_strbuf_string_get(title),
eina_strbuf_string_get(title));
+ win = elm_win_util_standard_add("edi_scm", "edi_scm");
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "edi");
elm_win_icon_object_set(win, icon);
@@ -33,8 +44,7 @@ _setup_win(void)
evas_object_resize(win, DEFAULT_WIDTH * elm_config_scale_get(),
DEFAULT_HEIGHT * elm_config_scale_get());
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL);
- eina_strbuf_free(title);
- free(cwd);
+ _win_title_set(win);
return win;
}
@@ -46,13 +56,17 @@ int main(int argc, char **argv)
ecore_init();
elm_init(argc, argv);
- win = _setup_win();
+ if (!edi_scm_generic_init())
+ exit(1 << 0);
+
+ win = _win_add();
edi_scm_ui_add(win);
elm_win_center(win, EINA_TRUE, EINA_TRUE);
evas_object_show(win);
ecore_main_loop_begin();
+ edi_scm_shutdown();
ecore_shutdown();
elm_shutdown();
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index cb75d52..6d743c1 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -507,6 +507,48 @@ _edi_scm_ui_file_changes_cb(void *data EINA_UNUSED, int
type EINA_UNUSED,
return ECORE_CALLBACK_DONE;
}
+char *
+_edi_scm_ui_workdir_get(void)
+{
+ Edi_Scm_Engine *engine;
+ char *directory, *workdir, *path, *tmp;
+
+ engine = edi_scm_engine_get();
+ if (!engine)
+ exit(1 << 1);
+
+ tmp = path = workdir = NULL;
+
+ directory = strdup(engine->workdir);
+
+ while (directory)
+ {
+path = edi_path_append(directory, engine->directory);
+if (ecore_file_exists(path) && ecore_file_is_dir(path))
+ {
+ if (!strcmp(directory, "/"))
+ workdir = strdup(directory);
+ else
+ workdir = strdup(ecore_file_file_get(directory));
+ break;
+ }
+
+tmp = ecore_file_dir_get(directory);
+free(directory);
+directory = tmp;
+free(path);
+path = NULL;
+ }
+
+ if (path)
+ free(path);
+
+ if (directory)
+ free(directory);
+
+ return workdir;
+}
+
void
edi_scm_ui_add(Evas_Object *parent)
{
@@ -520,9 +562,6 @@ edi_scm_ui_add(Evas_Object *parent)
const char *remote_name, *remote_email;
Eina_Bool staged_changes;
- if (!edi_scm_generic_init())
- exit(1 << 0);
-
engine = edi_scm_engine_get();
if (!engine)
exit(1 << 1);
diff --git a/src/bin/edi_scm_ui.h b/src/bin/edi_scm_ui.h
index 41dc6dd..510d613 100644
--- a/src/bin/edi_scm_ui.h
+++ b/src/bin/edi_scm_ui.h
@@ -30,6 +30,7 @@ extern "C" {
*/
void edi_scm_ui_add(Evas_Object *parent);
+char *_edi_scm_ui_workdir_get(void);
/**
* @}
*/
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index cfbd0ae..3f5604b 100644
--- a/src/lib/edi_scm.c
[EGIT] [tools/edi] master 01/01: Revert "edi_scm: make sure we give a sensible window title."
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=6fe6c805bf61726f661a86d6f548456d79633cf9
commit 6fe6c805bf61726f661a86d6f548456d79633cf9
Author: Al Poole
Date: Fri Oct 6 15:30:14 2017 +0100
Revert "edi_scm: make sure we give a sensible window title."
This reverts commit 83adef96a9e60ef8c1c03dbc2f534ba750146f06.
---
src/bin/edi_scm_main.c | 37 +++--
src/bin/edi_scm_ui.c | 29 +
src/bin/edi_scm_ui.h | 7 ++-
3 files changed, 18 insertions(+), 55 deletions(-)
diff --git a/src/bin/edi_scm_main.c b/src/bin/edi_scm_main.c
index 60d16b7..e1b77a9 100644
--- a/src/bin/edi_scm_main.c
+++ b/src/bin/edi_scm_main.c
@@ -1,8 +1,8 @@
#include
#include "edi_scm_ui.h"
-#define DEFAULT_WIDTH 480
-#define DEFAULT_HEIGHT 360
+#define DEFAULT_WIDTH 460
+#define DEFAULT_HEIGHT 280
static void
_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
@@ -12,17 +12,20 @@ _win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUS
}
static Evas_Object *
-window_setup(void)
+_setup_win(void)
{
Evas_Object *win, *icon;
Eina_Strbuf *title;
- char *path;
+ char *cwd;
+
+ cwd = getcwd(NULL, PATH_MAX);
title = eina_strbuf_new();
+ eina_strbuf_append_printf(title, "Edi Source Control :: %s", cwd);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_util_standard_add("edi_scm", "edi_scm");
+ win = elm_win_util_standard_add(eina_strbuf_string_get(title),
eina_strbuf_string_get(title));
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "edi");
elm_win_icon_object_set(win, icon);
@@ -30,33 +33,23 @@ window_setup(void)
evas_object_resize(win, DEFAULT_WIDTH * elm_config_scale_get(),
DEFAULT_HEIGHT * elm_config_scale_get());
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL);
- path = edi_scm_ui_add(win);
- if (!path)
- {
-fprintf(stderr, "ERR: unable to obtain path from SCM engine!\n");
-exit(EXIT_FAILURE);
- }
-
- eina_strbuf_append_printf(title, "Edi Source Control :: %s", path);
-
- elm_win_title_set(win, eina_strbuf_string_get(title));
-
- elm_win_center(win, EINA_TRUE, EINA_TRUE);
-
- evas_object_show(win);
-
eina_strbuf_free(title);
- free(path);
+ free(cwd);
return win;
}
int main(int argc, char **argv)
{
+ Evas_Object *win;
+
ecore_init();
elm_init(argc, argv);
- window_setup();
+ win = _setup_win();
+ edi_scm_ui_add(win);
+ elm_win_center(win, EINA_TRUE, EINA_TRUE);
+ evas_object_show(win);
ecore_main_loop_begin();
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index af423a9..cb75d52 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -507,32 +507,7 @@ _edi_scm_ui_file_changes_cb(void *data EINA_UNUSED, int
type EINA_UNUSED,
return ECORE_CALLBACK_DONE;
}
-static char *
-_edi_scm_find_directory(Edi_Scm_Engine *engine)
-{
- char *path;
- char *directory = strdup(engine->workdir);
-
- while (1)
-{
- if (!strcmp(directory, "/") || !strcmp(directory, "/home"))
- break;
-
- path = edi_path_append(directory, engine->directory);
- if (ecore_file_exists(path))
- {
-free(path);
-return directory;
- }
-
- free(path);
- directory = ecore_file_dir_get(directory);
-}
-
- return NULL;
-}
-
-char *
+void
edi_scm_ui_add(Evas_Object *parent)
{
Evas_Object *box, *frame, *hbox, *cbox, *label, *avatar, *input, *button;
@@ -772,7 +747,5 @@ edi_scm_ui_add(Evas_Object *parent)
elm_box_pack_end(hbox, button);
elm_box_pack_end(box, hbox);
-
- return _edi_scm_find_directory(engine);
}
diff --git a/src/bin/edi_scm_ui.h b/src/bin/edi_scm_ui.h
index 422a7f3..41dc6dd 100644
--- a/src/bin/edi_scm_ui.h
+++ b/src/bin/edi_scm_ui.h
@@ -24,14 +24,11 @@ extern "C" {
/**
* Create the commit dialog UI.
- *
+ *
* @param parent Parent object to add the commit UI to.
- *
- * @return Path of repository directory.
- *
* @ingroup SCM
*/
-char *edi_scm_ui_add(Evas_Object *parent);
+void edi_scm_ui_add(Evas_Object *parent);
/**
* @}
--
[EGIT] [tools/edi] master 01/01: edi_scm: make sure we give a sensible window title.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=83adef96a9e60ef8c1c03dbc2f534ba750146f06
commit 83adef96a9e60ef8c1c03dbc2f534ba750146f06
Author: Al Poole
Date: Fri Oct 6 14:24:03 2017 +0100
edi_scm: make sure we give a sensible window title.
When using edi_scm outside of EDI it's useful to show the
toplevel of the repository as the window title.
---
src/bin/edi_scm_main.c | 37 ++---
src/bin/edi_scm_ui.c | 29 -
src/bin/edi_scm_ui.h | 7 +--
3 files changed, 55 insertions(+), 18 deletions(-)
diff --git a/src/bin/edi_scm_main.c b/src/bin/edi_scm_main.c
index e1b77a9..60d16b7 100644
--- a/src/bin/edi_scm_main.c
+++ b/src/bin/edi_scm_main.c
@@ -1,8 +1,8 @@
#include
#include "edi_scm_ui.h"
-#define DEFAULT_WIDTH 460
-#define DEFAULT_HEIGHT 280
+#define DEFAULT_WIDTH 480
+#define DEFAULT_HEIGHT 360
static void
_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
@@ -12,20 +12,17 @@ _win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUS
}
static Evas_Object *
-_setup_win(void)
+window_setup(void)
{
Evas_Object *win, *icon;
Eina_Strbuf *title;
- char *cwd;
-
- cwd = getcwd(NULL, PATH_MAX);
+ char *path;
title = eina_strbuf_new();
- eina_strbuf_append_printf(title, "Edi Source Control :: %s", cwd);
elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED);
- win = elm_win_util_standard_add(eina_strbuf_string_get(title),
eina_strbuf_string_get(title));
+ win = elm_win_util_standard_add("edi_scm", "edi_scm");
icon = elm_icon_add(win);
elm_icon_standard_set(icon, "edi");
elm_win_icon_object_set(win, icon);
@@ -33,23 +30,33 @@ _setup_win(void)
evas_object_resize(win, DEFAULT_WIDTH * elm_config_scale_get(),
DEFAULT_HEIGHT * elm_config_scale_get());
evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL);
+ path = edi_scm_ui_add(win);
+ if (!path)
+ {
+fprintf(stderr, "ERR: unable to obtain path from SCM engine!\n");
+exit(EXIT_FAILURE);
+ }
+
+ eina_strbuf_append_printf(title, "Edi Source Control :: %s", path);
+
+ elm_win_title_set(win, eina_strbuf_string_get(title));
+
+ elm_win_center(win, EINA_TRUE, EINA_TRUE);
+
+ evas_object_show(win);
+
eina_strbuf_free(title);
- free(cwd);
+ free(path);
return win;
}
int main(int argc, char **argv)
{
- Evas_Object *win;
-
ecore_init();
elm_init(argc, argv);
- win = _setup_win();
- edi_scm_ui_add(win);
- elm_win_center(win, EINA_TRUE, EINA_TRUE);
- evas_object_show(win);
+ window_setup();
ecore_main_loop_begin();
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index cb75d52..af423a9 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -507,7 +507,32 @@ _edi_scm_ui_file_changes_cb(void *data EINA_UNUSED, int
type EINA_UNUSED,
return ECORE_CALLBACK_DONE;
}
-void
+static char *
+_edi_scm_find_directory(Edi_Scm_Engine *engine)
+{
+ char *path;
+ char *directory = strdup(engine->workdir);
+
+ while (1)
+{
+ if (!strcmp(directory, "/") || !strcmp(directory, "/home"))
+ break;
+
+ path = edi_path_append(directory, engine->directory);
+ if (ecore_file_exists(path))
+ {
+free(path);
+return directory;
+ }
+
+ free(path);
+ directory = ecore_file_dir_get(directory);
+}
+
+ return NULL;
+}
+
+char *
edi_scm_ui_add(Evas_Object *parent)
{
Evas_Object *box, *frame, *hbox, *cbox, *label, *avatar, *input, *button;
@@ -747,5 +772,7 @@ edi_scm_ui_add(Evas_Object *parent)
elm_box_pack_end(hbox, button);
elm_box_pack_end(box, hbox);
+
+ return _edi_scm_find_directory(engine);
}
diff --git a/src/bin/edi_scm_ui.h b/src/bin/edi_scm_ui.h
index 41dc6dd..422a7f3 100644
--- a/src/bin/edi_scm_ui.h
+++ b/src/bin/edi_scm_ui.h
@@ -24,11 +24,14 @@ extern "C" {
/**
* Create the commit dialog UI.
- *
+ *
* @param parent Parent object to add the commit UI to.
+ *
+ * @return Path of repository directory.
+ *
* @ingroup SCM
*/
-void edi_scm_ui_add(Evas_Object *parent);
+char *edi_scm_ui_add(Evas_Object *parent);
/**
* @}
--
[EGIT] [tools/edi] master 01/01: edi_scm: dont scroll on additions to elm_code_widget.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=317f5ed6465e9e468b7c7b5c4c78f607fb067128 commit 317f5ed6465e9e468b7c7b5c4c78f607fb067128 Author: Al Poole Date: Thu Oct 5 10:19:01 2017 +0100 edi_scm: dont scroll on additions to elm_code_widget. --- src/bin/edi_scm_ui.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c index 0722793..cb75d52 100644 --- a/src/bin/edi_scm_ui.c +++ b/src/bin/edi_scm_ui.c @@ -704,7 +704,7 @@ edi_scm_ui_add(Evas_Object *parent) edi_scm->code = code = elm_code_create(); entry = elm_code_widget_add(box, code); elm_code_parser_standard_add(code, ELM_CODE_PARSER_STANDARD_DIFF); - elm_obj_code_widget_gravity_set(entry, 0.0, 1.0); + elm_obj_code_widget_gravity_set(entry, 1.0, 0.0); elm_obj_code_widget_editable_set(entry, EINA_FALSE); elm_obj_code_widget_line_numbers_set(entry, EINA_FALSE); evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); --
[EGIT] [tools/edi] master 01/01: edi_main: don't use exit, goto and shutdown properly.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=251ea96020fe0aafbe4c521681f10a18dff74694
commit 251ea96020fe0aafbe4c521681f10a18dff74694
Author: Al Poole
Date: Wed Oct 4 16:53:28 2017 +0100
edi_main: don't use exit, goto and shutdown properly.
---
src/bin/edi_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 134bf29..d8573f2 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -1606,7 +1606,7 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
args = ecore_getopt_parse(&optdesc, values, argc, argv);
if (quit_option)
{
-exit(1);
+goto end;
}
else if (args < 0)
{
--
[EGIT] [tools/edi] master 01/01: main: parsing command-line options.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=a1be071c4ccd129fef65b3e44764da4def1fb237
commit a1be071c4ccd129fef65b3e44764da4def1fb237
Author: Al Poole
Date: Tue Oct 3 14:11:50 2017 +0100
main: parsing command-line options.
Exit rather than shutdown if displaying --help or
--copyright etc.
@fix T6115
---
src/bin/edi_main.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 62f6a26..134bf29 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -39,7 +39,7 @@ typedef struct _Edi_Panel_Slide_Effect
Eina_Bool left;
} Edi_Panel_Slide_Effect;
-#define COPYRIGHT "Copyright © 2014-2015 Andy Williams
and various contributors (see AUTHORS)."
+#define COPYRIGHT "Copyright © 2014-2017 Andy Williams
and various contributors (see AUTHORS)."
static Evas_Object *_edi_toolbar, *_edi_leftpanes, *_edi_bottompanes;
static Evas_Object *_edi_logpanel, *_edi_consolepanel, *_edi_testpanel,
*_edi_searchpanel, *_edi_taskspanel, *_edi_debugpanel;
@@ -1604,13 +1604,13 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
goto end;
args = ecore_getopt_parse(&optdesc, values, argc, argv);
- if (args < 0)
+ if (quit_option)
{
-CRIT("Could not parse arguments.");
-goto end;
+exit(1);
}
- else if (quit_option)
+ else if (args < 0)
{
+CRIT("Could not parse arguments.");
goto end;
}
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: Canvas layout: fix Efl.text (non-legacy) TEXT parts
Hey Daniel,
I updated and tested here and the internal dialogues seem fine now as well
as the notifications.
On Mon, Oct 2, 2017 at 6:57 PM, Daniel Hirt wrote:
> Hi all,
>
> The broken dialog and notification windows were introduced in a previous
> commit of mine. This commit fixes those issues for me.
>
> What do I need to run to reproduce the issues?
>
> --
> Danny (herdsman) Hirt
>
>
> On 10/02/2017 06:10 PM, Al Poole wrote:
>
>> Desktop notifications too (in case that's fixed/handled differently).
>>
>> On Mon, Oct 2, 2017 at 12:42 PM, Carsten Haitzler
>> wrote:
>>
>> On Mon, 02 Oct 2017 01:13:41 -0700 Daniel Hirt
>>> said:
>>>
>>> now all of e's error dialogs are broke with visible tags..
>>>
>>> herdsman pushed a commit to branch master.
>>>>
>>>> http://git.enlightenment.org/core/efl.git/commit/?id=
>>>>
>>> eadf313702f81f05d39ba6c47385b8d8420a1330
>>>
>>>>
>>>> commit eadf313702f81f05d39ba6c47385b8d8420a1330
>>>> Author: Daniel Hirt
>>>> Date: Mon Oct 2 11:03:37 2017 +0300
>>>>
>>>> Canvas layout: fix Efl.text (non-legacy) TEXT parts
>>>>
>>>> Current implementation should also support TEXT parts (like button)
>>>> with usage of efl_text_set.
>>>>
>>>> Follow-up to 0061a4bb349e6c8e122913791bf83f7f40b0cede.
>>>> ---
>>>> src/lib/edje/edje_util.c | 24 +---
>>>> 1 file changed, 9 insertions(+), 15 deletions(-)
>>>>
>>>> diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
>>>> index db0a3939c7..8db4ffd9a3 100644
>>>> --- a/src/lib/edje/edje_util.c
>>>> +++ b/src/lib/edje/edje_util.c
>>>> @@ -1861,25 +1861,19 @@ _edje_object_part_text_raw_generic_set(Edje
>>>> *ed,
>>>> Evas_Object *obj, Edje_Real_Par else
>>>> if (text)
>>>>{
>>>> -if (legacy)
>>>> +if (legacy || (rp->part->type == EDJE_PART_TYPE_TEXT) ||
>>>>
>>> set_markup)
>>>
>>>> {
>>>>rp->typedata.text->text = eina_stringshare_add(text);
>>>> }
>>>> -else if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
>>>> +else // !legacy && (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
>>>> + // && !set_markup
>>>> {
>>>> - if (set_markup)
>>>> - {
>>>> - rp->typedata.text->text = eina_stringshare_add(text);
>>>> - }
>>>> - else
>>>> - {
>>>> - char *mkup;
>>>> - mkup = efl_text_markup_util_text_to_markup(
>>>> - EFL_TEXT_MARKUP_UTIL_CLASS,
>>>> - text);
>>>> - rp->typedata.text->text = eina_stringshare_add(mkup);
>>>> - free(mkup);
>>>> - }
>>>> + char *mkup;
>>>> + mkup = efl_text_markup_util_text_to_markup(
>>>> +EFL_TEXT_MARKUP_UTIL_CLASS,
>>>> +text);
>>>> + rp->typedata.text->text = eina_stringshare_add(mkup);
>>>> + free(mkup);
>>>> }
>>>>}
>>>> ed->dirty = EINA_TRUE;
>>>>
>>>> --
>>>>
>>>>
>>>>
>>>
>>> --
>>> - Codito, ergo sum - "I code, therefore I am" --
>>> Carsten Haitzler - ras...@rasterman.com
>>>
>>>
>>>
>>> --
>>> Check out the vibrant tech community on one of the world's most
>>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>>> ___
>>> enlightenment-devel mailing list
>>> enlightenment-devel@lists.sourceforge.net
>>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>>>
>>>
>> --
>> Check out the vibrant tech community on one of the world's most
>> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
>> ___
>> enlightenment-devel mailing list
>> enlightenment-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>>
>>
>
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: Canvas layout: fix Efl.text (non-legacy) TEXT parts
Desktop notifications too (in case that's fixed/handled differently).
On Mon, Oct 2, 2017 at 12:42 PM, Carsten Haitzler
wrote:
> On Mon, 02 Oct 2017 01:13:41 -0700 Daniel Hirt
> said:
>
> now all of e's error dialogs are broke with visible tags..
>
> > herdsman pushed a commit to branch master.
> >
> > http://git.enlightenment.org/core/efl.git/commit/?id=
> eadf313702f81f05d39ba6c47385b8d8420a1330
> >
> > commit eadf313702f81f05d39ba6c47385b8d8420a1330
> > Author: Daniel Hirt
> > Date: Mon Oct 2 11:03:37 2017 +0300
> >
> > Canvas layout: fix Efl.text (non-legacy) TEXT parts
> >
> > Current implementation should also support TEXT parts (like button)
> > with usage of efl_text_set.
> >
> > Follow-up to 0061a4bb349e6c8e122913791bf83f7f40b0cede.
> > ---
> > src/lib/edje/edje_util.c | 24 +---
> > 1 file changed, 9 insertions(+), 15 deletions(-)
> >
> > diff --git a/src/lib/edje/edje_util.c b/src/lib/edje/edje_util.c
> > index db0a3939c7..8db4ffd9a3 100644
> > --- a/src/lib/edje/edje_util.c
> > +++ b/src/lib/edje/edje_util.c
> > @@ -1861,25 +1861,19 @@ _edje_object_part_text_raw_generic_set(Edje *ed,
> > Evas_Object *obj, Edje_Real_Par else
> > if (text)
> > {
> > -if (legacy)
> > +if (legacy || (rp->part->type == EDJE_PART_TYPE_TEXT) ||
> set_markup)
> >{
> > rp->typedata.text->text = eina_stringshare_add(text);
> >}
> > -else if (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
> > +else // !legacy && (rp->part->type == EDJE_PART_TYPE_TEXTBLOCK)
> > + // && !set_markup
> >{
> > - if (set_markup)
> > - {
> > - rp->typedata.text->text = eina_stringshare_add(text);
> > - }
> > - else
> > - {
> > - char *mkup;
> > - mkup = efl_text_markup_util_text_to_markup(
> > - EFL_TEXT_MARKUP_UTIL_CLASS,
> > - text);
> > - rp->typedata.text->text = eina_stringshare_add(mkup);
> > - free(mkup);
> > - }
> > + char *mkup;
> > + mkup = efl_text_markup_util_text_to_markup(
> > +EFL_TEXT_MARKUP_UTIL_CLASS,
> > +text);
> > + rp->typedata.text->text = eina_stringshare_add(mkup);
> > + free(mkup);
> >}
> > }
> > ed->dirty = EINA_TRUE;
> >
> > --
> >
> >
>
>
> --
> - Codito, ergo sum - "I code, therefore I am" --
> Carsten Haitzler - ras...@rasterman.com
>
>
>
> --
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> ___
> enlightenment-devel mailing list
> enlightenment-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
>
--
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [tools/edi] master 01/01: Revert "about: explicitly set bg colour and alpha."
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=543de0a53e6c5607969661004d1b77c8bfd7e483
commit 543de0a53e6c5607969661004d1b77c8bfd7e483
Author: Al Poole
Date: Mon Oct 2 13:25:34 2017 +0100
Revert "about: explicitly set bg colour and alpha."
This reverts commit 9ef65252ed1517c6f351860e0760a30c059dcb73.
This is probably hiding another issue, so reverting to its
previous state.
---
src/bin/screens/edi_about.c | 9 -
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index e261284..48a4770 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -24,6 +24,7 @@ edi_about_show(Evas_Object *mainwin)
{
Evas_Object *win, *vbox, *box, *table, *bg;
Evas_Object *text, *title, *authors, *buttonbox, *button, *space;
+ int alpha, r, g, b;
char buf[PATH_MAX];
win = elm_win_add(mainwin, "about", ELM_WIN_BASIC);
@@ -44,12 +45,18 @@ edi_about_show(Evas_Object *mainwin)
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);
+ 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);
+
vbox = elm_box_add(win);
elm_box_padding_set(vbox, 25, 0);
elm_box_horizontal_set(vbox, EINA_TRUE);
--
[EGIT] [tools/edi] master 01/01: edi_scm: initalise to quieten compiler.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=6e263b091eb929c1ac2d59b3a5c69f7da2a17874 commit 6e263b091eb929c1ac2d59b3a5c69f7da2a17874 Author: Al Poole Date: Sun Oct 1 12:40:00 2017 +0100 edi_scm: initalise to quieten compiler. --- src/bin/edi_scm_ui.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c index 1ea64e1..e522ec2 100644 --- a/src/bin/edi_scm_ui.c +++ b/src/bin/edi_scm_ui.c @@ -223,6 +223,8 @@ _content_get(void *data, Evas_Object *obj, const char *source) const char *text, *icon_file, *icon_status, *mime; Edi_Scm_Status *status; + icon_file = NULL; + if (strcmp(source, "elm.swallow.content")) return NULL; --
[EGIT] [tools/edi] master 01/01: mainview: search + search/replace popups, UI improvement.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=fc855bf0bb9b5572394693f2f5fe74d0d2d65971
commit fc855bf0bb9b5572394693f2f5fe74d0d2d65971
Author: Al Poole
Date: Sun Oct 1 11:43:52 2017 +0100
mainview: search + search/replace popups, UI improvement.
---
src/bin/mainview/edi_mainview.c | 51 -
1 file changed, 15 insertions(+), 36 deletions(-)
diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c
index 010055b..b1a25b1 100644
--- a/src/bin/mainview/edi_mainview.c
+++ b/src/bin/mainview/edi_mainview.c
@@ -543,7 +543,7 @@ _edi_mainview_project_search_popup_key_up_cb(void *data
EINA_UNUSED, Evas *e EIN
void
edi_mainview_project_search_popup_show(void)
{
- Evas_Object *popup, *box, *input, *button, *sep, *label;
+ Evas_Object *popup, *frame, *box, *input, *button, *label;
popup = elm_popup_add(_main_win);
_edi_mainview_search_project_popup = popup;
@@ -552,21 +552,12 @@ edi_mainview_project_search_popup_show(void)
box = elm_box_add(popup);
evas_object_show(box);
- sep = elm_separator_add(box);
- elm_separator_horizontal_set(sep, EINA_TRUE);
- evas_object_show(sep);
- elm_box_pack_end(box, sep);
label = elm_label_add(popup);
- elm_object_text_set(label, _("Please enter a term to search for within
the whole project."));
+ elm_object_text_set(label, _("Please enter a term to search for within
the whole project."));
evas_object_show(label);
elm_box_pack_end(box, label);
- sep = elm_separator_add(box);
- elm_separator_horizontal_set(sep, EINA_TRUE);
- evas_object_show(sep);
- elm_box_pack_end(box, sep);
-
input = elm_entry_add(box);
elm_entry_single_line_set(input, EINA_TRUE);
elm_entry_editable_set(input, EINA_TRUE);
@@ -578,12 +569,11 @@ edi_mainview_project_search_popup_show(void)
elm_box_pack_end(box, input);
evas_object_show(box);
- sep = elm_separator_add(box);
- elm_separator_horizontal_set(sep, EINA_TRUE);
- evas_object_show(sep);
- elm_box_pack_end(box, sep);
+ frame = elm_frame_add(box);
+ evas_object_show(frame);
+ elm_object_content_set(frame, box);
+ elm_object_content_set(popup, frame);
- elm_object_content_set(popup, box);
button = elm_button_add(popup);
elm_object_text_set(button, _("Cancel"));
@@ -643,33 +633,23 @@ _edi_mainview_project_replace_cb(void *data,
void
edi_mainview_project_replace_popup_show(void)
{
- Evas_Object *popup, *table, *box, *label, *sep, *search, *replace, *button;
-
+ Evas_Object *popup, *table, *box, *label, *search, *replace, *button;
+ Evas_Object *frame;
popup = elm_popup_add(_main_win);
_edi_mainview_search_project_popup = popup;
- elm_object_part_text_set(popup, "title,text", _("Search & Replace"));
+ elm_object_part_text_set(popup, "title,text", _("Search & Replace"));
box = elm_box_add(popup);
- elm_object_content_set(popup, box);
-
- sep = elm_separator_add(box);
- elm_separator_horizontal_set(sep, EINA_TRUE);
- evas_object_show(sep);
- elm_box_pack_end(box, sep);
label = elm_label_add(box);
- elm_object_text_set(label, _("Replace all occurences of text within the
whole project."));
+ elm_object_text_set(label, _("Replace all occurences of text within the
whole project."));
evas_object_show(label);
elm_box_pack_end(box, label);
- sep = elm_separator_add(box);
- elm_separator_horizontal_set(sep, EINA_TRUE);
- evas_object_show(sep);
- elm_box_pack_end(box, sep);
-
table = elm_table_add(box);
evas_object_size_hint_weight_set(table, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(table, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_table_padding_set(table, 5, 5);
evas_object_show(table);
label = elm_label_add(table);
@@ -699,11 +679,10 @@ edi_mainview_project_replace_popup_show(void)
elm_table_pack(table, replace, 1, 1, 1, 1);
elm_box_pack_end(box, table);
-
- sep = elm_separator_add(box);
- elm_separator_horizontal_set(sep, EINA_TRUE);
- evas_object_show(sep);
- elm_box_pack_end(box, sep);
+ frame = elm_frame_add(table);
+ evas_object_show(frame);
+ elm_object_content_set(popup, frame);
+ elm_object_content_set(frame, box);
button = elm_button_add(popup);
elm_object_text_set(button, _("Cancel"));
--
[EGIT] [tools/edi] master 01/01: about: explicitly set bg colour and alpha.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=9ef65252ed1517c6f351860e0760a30c059dcb73
commit 9ef65252ed1517c6f351860e0760a30c059dcb73
Author: Al Poole
Date: Sun Oct 1 11:27:38 2017 +0100
about: explicitly set bg colour and alpha.
---
src/bin/screens/edi_about.c | 9 +
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/src/bin/screens/edi_about.c b/src/bin/screens/edi_about.c
index 48a4770..e261284 100644
--- a/src/bin/screens/edi_about.c
+++ b/src/bin/screens/edi_about.c
@@ -24,7 +24,6 @@ edi_about_show(Evas_Object *mainwin)
{
Evas_Object *win, *vbox, *box, *table, *bg;
Evas_Object *text, *title, *authors, *buttonbox, *button, *space;
- int alpha, r, g, b;
char buf[PATH_MAX];
win = elm_win_add(mainwin, "about", ELM_WIN_BASIC);
@@ -45,18 +44,12 @@ edi_about_show(Evas_Object *mainwin)
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);
- 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);
-
vbox = elm_box_add(win);
elm_box_padding_set(vbox, 25, 0);
elm_box_horizontal_set(vbox, EINA_TRUE);
--
[EGIT] [core/efl] master 01/01: elm_code_widget: set appropriate background colour.
netstar pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=9ab866f32c5cf965a254fd21a47f086887053398 commit 9ab866f32c5cf965a254fd21a47f086887053398 Author: Al Poole Date: Sun Oct 1 11:10:28 2017 +0100 elm_code_widget: set appropriate background colour. --- 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 c6493f4cd7..dc2f49fe33 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c @@ -2217,7 +2217,7 @@ _elm_code_widget_efl_canvas_group_group_add(Eo *obj, Elm_Code_Widget_Data *pd) pd->scroller = scroller; background = elm_bg_add(scroller); - evas_object_color_set(background, 145, 145, 145, 255); + evas_object_color_set(background, 36, 36, 36, 255); evas_object_size_hint_weight_set(background, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(background, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_show(background); --
[EGIT] [tools/edi] master 01/01: edi_scm: fix memory leak.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=9b5af0abfcf0500495d5424327e90969e95313f0
commit 9b5af0abfcf0500495d5424327e90969e95313f0
Author: Al Poole
Date: Sat Sep 30 23:59:33 2017 +0100
edi_scm: fix memory leak.
If cancelling the diff while it's loading can potenitally lose
the contents of the diff buffer. This patch fixes that...
---
src/bin/edi_scm_ui.c | 27 +++
1 file changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index 80edefa..1ea64e1 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -12,6 +12,7 @@ typedef struct _Edi_Scm_Ui {
Eio_Monitor *monitor;
Elm_Code *code;
const char *workdir;
+ void *data;
Eina_Bool results_max;
Eina_Bool is_configured;
@@ -83,8 +84,6 @@ _edi_scm_ui_screens_message_close_cb(void *data EINA_UNUSED,
Evas_Object *popup = data;
evas_object_del(popup);
-
- elm_exit();
}
static void
@@ -404,6 +403,12 @@ _edi_scm_diff_thread_cancel_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
edi_scm->in_progress = EINA_FALSE;
edi_scm->thread = NULL;
+
+ if (edi_scm->data)
+ {
+free(edi_scm->data);
+edi_scm->data = NULL;
+ }
}
static void
@@ -418,19 +423,19 @@ _edi_scm_diff_thread_end_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
static void
_edi_scm_diff_thread_cb(void *data, Ecore_Thread *thread)
{
- char *text;
Edi_Scm_Ui *edi_scm = data;
if (edi_scm->in_progress) return;
- text = edi_scm_diff(!edi_scm->results_max);
+ edi_scm->data = edi_scm_diff(!edi_scm->results_max);
edi_scm->in_progress = EINA_TRUE;
edi_scm->thread = thread;
- _entry_lines_append(thread, edi_scm->code, text);
+ _entry_lines_append(thread, edi_scm->code, edi_scm->data);
- free(text);
+ free(edi_scm->data);
+ edi_scm->data = NULL;
}
static void
@@ -455,8 +460,8 @@ _edi_scm_ui_refresh(Edi_Scm_Ui *edi_scm)
}
else
{
- elm_object_disabled_set(edi_scm->commit_button, !staged);
- elm_entry_editable_set(edi_scm->commit_entry, staged);
+elm_object_disabled_set(edi_scm->commit_button, !staged);
+elm_entry_editable_set(edi_scm->commit_entry, staged);
}
elm_genlist_realized_items_update(edi_scm->list);
@@ -474,6 +479,12 @@ _edi_scm_ui_refresh_cb(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, voi
while ((ecore_thread_wait(edi_scm->thread, 0.1)) != EINA_TRUE);
+ if (edi_scm->data)
+ {
+free(edi_scm->data);
+edi_scm->data = NULL;
+ }
+
_edi_scm_ui_refresh(edi_scm);
}
--
[EGIT] [tools/edi] master 01/01: edi_scm: small stylistic.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=76a029a09eed064df9707ccb219a12d7b0824c45
commit 76a029a09eed064df9707ccb219a12d7b0824c45
Author: Al Poole
Date: Sat Sep 30 22:53:09 2017 +0100
edi_scm: small stylistic.
---
src/bin/edi_scm_ui.c | 41 +++--
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index 466aade..80edefa 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -83,6 +83,7 @@ _edi_scm_ui_screens_message_close_cb(void *data EINA_UNUSED,
Evas_Object *popup = data;
evas_object_del(popup);
+
elm_exit();
}
@@ -110,9 +111,11 @@ _edi_scm_ui_screens_cancel_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
Edi_Scm_Ui *edi_scm = data;
- if (edi_scm->thread) ecore_thread_cancel(edi_scm->thread);
+ if (edi_scm->thread)
+ ecore_thread_cancel(edi_scm->thread);
while ((ecore_thread_wait(edi_scm->thread, 0.1)) != EINA_TRUE);
+
evas_object_del(edi_scm->parent);
if (edi_scm->monitor)
@@ -150,7 +153,8 @@ _edi_scm_ui_screens_commit_cb(void *data,
free(message);
- if (edi_scm->thread) ecore_thread_cancel(edi_scm->thread);
+ if (edi_scm->thread)
+ ecore_thread_cancel(edi_scm->thread);
while ((ecore_thread_wait(edi_scm->thread, 0.1)) != EINA_TRUE);
@@ -325,25 +329,25 @@ _edi_scm_ui_status_list_fill(Edi_Scm_Ui *edi_scm)
itc->func.state_get = NULL;
itc->func.del = _content_del;
- if (edi_scm_status_get())
+ if (!edi_scm_status_get())
+ goto done;
+
+ EINA_LIST_FOREACH(e->statuses, l, status)
{
-EINA_LIST_FOREACH(e->statuses, l, status)
+if (edi_scm->results_max)
+ {
+ elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ }
+else
{
- if (edi_scm->results_max)
- {
- elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
- }
- else
- {
- if (status->staged)
-elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
- else
-_edi_scm_ui_status_free(status);
- }
-
if (status->staged)
- staged = EINA_TRUE;
+ elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ else
+ _edi_scm_ui_status_free(status);
}
+
+if (status->staged)
+ staged = EINA_TRUE;
}
if (e->statuses)
@@ -351,7 +355,7 @@ _edi_scm_ui_status_list_fill(Edi_Scm_Ui *edi_scm)
eina_list_free(e->statuses);
e->statuses = NULL;
}
-
+done:
elm_genlist_item_class_free(itc);
return staged;
@@ -397,6 +401,7 @@ static void
_edi_scm_diff_thread_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Edi_Scm_Ui *edi_scm = data;
+
edi_scm->in_progress = EINA_FALSE;
edi_scm->thread = NULL;
}
--
[EGIT] [tools/edi] master 01/01: edi_scm: show window at appropriate time.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=16d6a4462504618f2ada53bb4b829ad3e22ddb31 commit 16d6a4462504618f2ada53bb4b829ad3e22ddb31 Author: Al Poole Date: Sat Sep 30 22:26:10 2017 +0100 edi_scm: show window at appropriate time. Avoid bogus flickering during startup. --- src/bin/edi_scm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edi_scm_main.c b/src/bin/edi_scm_main.c index 2a0cd94..e1b77a9 100644 --- a/src/bin/edi_scm_main.c +++ b/src/bin/edi_scm_main.c @@ -32,7 +32,6 @@ _setup_win(void) evas_object_resize(win, DEFAULT_WIDTH * elm_config_scale_get(), DEFAULT_HEIGHT * elm_config_scale_get()); evas_object_smart_callback_add(win, "delete,request", _win_del_cb, NULL); - evas_object_show(win); eina_strbuf_free(title); free(cwd); @@ -50,6 +49,7 @@ int main(int argc, char **argv) win = _setup_win(); edi_scm_ui_add(win); elm_win_center(win, EINA_TRUE, EINA_TRUE); + evas_object_show(win); ecore_main_loop_begin(); --
[EGIT] [tools/edi] master 01/01: scm_ui: make sure we clear the widget.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=4149ee7c526356bf7d45bdb65eff5e90baadc961 commit 4149ee7c526356bf7d45bdb65eff5e90baadc961 Author: Al Poole Date: Sat Sep 30 20:56:31 2017 +0100 scm_ui: make sure we clear the widget. meh meh meh... --- src/bin/edi_scm_ui.c | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c index 9593f33..466aade 100644 --- a/src/bin/edi_scm_ui.c +++ b/src/bin/edi_scm_ui.c @@ -150,6 +150,12 @@ _edi_scm_ui_screens_commit_cb(void *data, free(message); + if (edi_scm->thread) ecore_thread_cancel(edi_scm->thread); + + while ((ecore_thread_wait(edi_scm->thread, 0.1)) != EINA_TRUE); + + evas_object_del(edi_scm->parent); + if (edi_scm->monitor) eio_monitor_del(edi_scm->monitor); @@ -430,7 +436,10 @@ _edi_scm_ui_refresh(Edi_Scm_Ui *edi_scm) edi_scm->results_max = elm_check_state_get(edi_scm->check); elm_genlist_clear(edi_scm->list); + elm_code_file_clear(edi_scm->code->file); + /* FIXME: Clears but does not render until it *has* to. */ + elm_code_file_line_append(edi_scm->code->file, "\n", 1, NULL); staged = _edi_scm_ui_status_list_fill(edi_scm); @@ -536,7 +545,7 @@ edi_scm_ui_add(Evas_Object *parent) evas_object_show(logo); elm_box_pack_end(hbox, logo); - /* General information*/ + /* General information */ label = elm_label_add(hbox); evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 1.0); --
[EGIT] [tools/edi] master 01/01: edi_scm: handle thread cancel and shutdown properly.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=a49931161c4d4a60939440bb3bd7a3cfbc88dee8
commit a49931161c4d4a60939440bb3bd7a3cfbc88dee8
Author: Al Poole
Date: Sat Sep 30 20:31:21 2017 +0100
edi_scm: handle thread cancel and shutdown properly.
This allows to flip switches and stuff while we're rendering
and changing stuffz. So shutdown during rendering should be ok
and also we can switch between modes without spazzing out.
Thanks be to God!
---
src/bin/edi_scm_ui.c | 33 +
1 file changed, 21 insertions(+), 12 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index e8f45c0..9593f33 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -8,20 +8,21 @@
#include "edi_private.h"
typedef struct _Edi_Scm_Ui {
+ Ecore_Thread *thread;
+ Eio_Monitor *monitor;
+ Elm_Code *code;
+ const char *workdir;
+
+ Eina_Bool results_max;
+ Eina_Bool is_configured;
+ Eina_Bool in_progress;
+
Evas_Object *parent;
Evas_Object *list;
Evas_Object *check;
Evas_Object *commit_button;
Evas_Object *commit_entry;
- Eio_Monitor *monitor;
- Elm_Code*code;
- const char *workdir;
-
- Eina_Bool results_max;
- Eina_Bool is_configured;
- Eina_Bool in_progress;
-
} Edi_Scm_Ui;
const char *
@@ -109,6 +110,9 @@ _edi_scm_ui_screens_cancel_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
Edi_Scm_Ui *edi_scm = data;
+ if (edi_scm->thread) ecore_thread_cancel(edi_scm->thread);
+
+ while ((ecore_thread_wait(edi_scm->thread, 0.1)) != EINA_TRUE);
evas_object_del(edi_scm->parent);
if (edi_scm->monitor)
@@ -130,7 +134,6 @@ _edi_scm_ui_screens_commit_cb(void *data,
char *message;
engine = edi_scm_engine_get();
- // engine has been checked before now
if (!engine)
return;
@@ -385,12 +388,11 @@ _entry_lines_append(Ecore_Thread *thread, Elm_Code *code,
char *text)
}
static void
-_edi_scm_diff_thread_cancel_cb(void *data, Ecore_Thread *thread)
+_edi_scm_diff_thread_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
{
Edi_Scm_Ui *edi_scm = data;
- while ((ecore_thread_wait(thread, 0.1)) != EINA_TRUE);
edi_scm->in_progress = EINA_FALSE;
- elm_exit();
+ edi_scm->thread = NULL;
}
static void
@@ -399,6 +401,7 @@ _edi_scm_diff_thread_end_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
Edi_Scm_Ui *edi_scm = data;
edi_scm->in_progress = EINA_FALSE;
+ edi_scm->thread = NULL;
}
static void
@@ -412,6 +415,7 @@ _edi_scm_diff_thread_cb(void *data, Ecore_Thread *thread)
text = edi_scm_diff(!edi_scm->results_max);
edi_scm->in_progress = EINA_TRUE;
+ edi_scm->thread = thread;
_entry_lines_append(thread, edi_scm->code, text);
@@ -451,6 +455,11 @@ _edi_scm_ui_refresh_cb(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED, voi
{
Edi_Scm_Ui *edi_scm = data;
+ if (edi_scm->thread)
+ ecore_thread_cancel(edi_scm->thread);
+
+ while ((ecore_thread_wait(edi_scm->thread, 0.1)) != EINA_TRUE);
+
_edi_scm_ui_refresh(edi_scm);
}
--
[EGIT] [tools/edi] master 01/01: edi_scm: refactor code and use threads.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=9cad93b64ff7c4b43aa8b3b501c9d4c4003dc549
commit 9cad93b64ff7c4b43aa8b3b501c9d4c4003dc549
Author: Al Poole
Date: Sat Sep 30 19:51:28 2017 +0100
edi_scm: refactor code and use threads.
Refactor and use a thread so we don't lock up the UI.
---
src/bin/edi_scm_ui.c | 147 +--
1 file changed, 97 insertions(+), 50 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index b78771e..e8f45c0 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -15,16 +15,15 @@ typedef struct _Edi_Scm_Ui {
Evas_Object *commit_entry;
Eio_Monitor *monitor;
- Elm_Code *code;
- const char *workdir;
+ Elm_Code*code;
+ const char *workdir;
Eina_Bool results_max;
Eina_Bool is_configured;
+ Eina_Bool in_progress;
} Edi_Scm_Ui;
-static void _edi_scm_ui_refresh(Edi_Scm_Ui *);
-
const char *
_edi_scm_ui_avatar_cache_path_get(const char *email)
{
@@ -156,32 +155,6 @@ _edi_scm_ui_screens_commit_cb(void *data,
elm_exit();
}
-static void
-_entry_lines_append(Elm_Code *code, char *text)
-{
- char *pos = text;
- char *start, *end = NULL;
-
- if (!*pos) return;
-
- start = pos;
- while (*pos++ != '\0')
-{
- if (*pos == '\n')
- end = pos;
-
- if (start && end)
- {
-elm_code_file_line_append(code->file, start, end - start, NULL);
-start = end + 1;
-end = NULL;
- }
-}
-end = pos;
-if (end > start)
- elm_code_file_line_append(code->file, start, end - start, NULL);
-}
-
static const char *
_icon_status(Edi_Scm_Status_Code code)
{
@@ -235,7 +208,7 @@ static Evas_Object *
_content_get(void *data, Evas_Object *obj, const char *source)
{
Evas_Object *box, *lbox, *mbox, *rbox, *label, *ic;
- const char *text, *icon_name, *icon_status, *mime;
+ const char *text, *icon_file, *icon_status, *mime;
Edi_Scm_Status *status;
if (strcmp(source, "elm.swallow.content"))
@@ -243,14 +216,12 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
status = (Edi_Scm_Status *) data;
- icon_status = _icon_status(status->change);
-
mime = efreet_mime_type_get(status->fullpath);
if (mime)
- icon_name = efreet_mime_type_icon_get(mime, elm_config_icon_theme_get(),
32);
+ icon_file = efreet_mime_type_icon_get(mime, elm_config_icon_theme_get(),
32);
- if (!icon_name)
- icon_name = "dialog-information";
+ if (!icon_file)
+ icon_file = "dialog-information";
box = elm_box_add(obj);
elm_box_horizontal_set(box, EINA_TRUE);
@@ -262,7 +233,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_show(lbox);
ic = elm_icon_add(lbox);
- elm_icon_standard_set(ic, icon_name);
+ elm_icon_standard_set(ic, icon_file);
evas_object_size_hint_min_set(ic, ELM_SCALE_SIZE(16), ELM_SCALE_SIZE(16));
evas_object_show(ic);
elm_box_pack_end(lbox, ic);
@@ -282,6 +253,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_box_padding_set(rbox, 5, 0);
evas_object_show(rbox);
+ icon_status = _icon_status(status->change);
if (icon_status)
{
ic = elm_icon_add(rbox);
@@ -377,9 +349,78 @@ _edi_scm_ui_status_list_fill(Edi_Scm_Ui *edi_scm)
}
static void
-_edi_scm_ui_refresh(Edi_Scm_Ui *edi_scm)
+_entry_lines_append(Ecore_Thread *thread, Elm_Code *code, char *text)
+{
+ char *pos = text;
+ char *start, *end = NULL;
+
+ if (!*pos) return;
+
+ start = pos;
+ while (*pos++ != '\0')
+{
+ if (*pos == '\n')
+ end = pos;
+
+ if (start && end)
+ {
+ecore_thread_main_loop_begin();
+elm_code_file_line_append(code->file, start, end - start, NULL);
+ecore_thread_main_loop_end();
+start = end + 1;
+end = NULL;
+if (ecore_thread_check(thread))
+ return;
+ }
+}
+
+end = pos;
+
+if (end > start)
+ {
+ ecore_thread_main_loop_begin();
+ elm_code_file_line_append(code->file, start, end - start, NULL);
+ ecore_thread_main_loop_end();
+ }
+}
+
+static void
+_edi_scm_diff_thread_cancel_cb(void *data, Ecore_Thread *thread)
+{
+ Edi_Scm_Ui *edi_scm = data;
+ while ((ecore_thread_wait(thread, 0.1)) != EINA_TRUE);
+ edi_scm->in_progress = EINA_FALSE;
+ elm_exit();
+}
+
+static void
+_edi_scm_diff_thread_end_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
+{
+ Edi_Scm_Ui *edi_scm = data;
+
+ edi_scm->in_progress = EINA_FALSE;
+}
+
+static void
+_edi_scm_diff_thread_cb(void *data, Ecore_Thread *thread)
{
char *text;
+ Edi_Scm_Ui *edi_scm = data;
+
+ if (edi_scm->in_progress) return;
+
+ text
[EGIT] [tools/edi] master 01/01: edi_scm: rename some borrowed functions.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=12dce44812eea73e049aaf03f33479082e1628c2
commit 12dce44812eea73e049aaf03f33479082e1628c2
Author: Al Poole
Date: Sat Sep 30 13:06:58 2017 +0100
edi_scm: rename some borrowed functions.
Fix typo also in header.
---
src/bin/edi_scm_ui.c | 41 +
src/bin/edi_scm_ui.h | 2 +-
2 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index e03279b..b78771e 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -7,17 +7,17 @@
#include "edi_scm_ui.h"
#include "edi_private.h"
-static Evas_Object *_parent_obj, *_popup, *_edi_scm_ui_screens_message_popup;
-
typedef struct _Edi_Scm_Ui {
- Eio_Monitor *monitor;
- Elm_Code *code;
+ Evas_Object *parent;
Evas_Object *list;
Evas_Object *check;
Evas_Object *commit_button;
Evas_Object *commit_entry;
+ Eio_Monitor *monitor;
+ Elm_Code *code;
const char *workdir;
+
Eina_Bool results_max;
Eina_Bool is_configured;
@@ -87,11 +87,11 @@ _edi_scm_ui_screens_message_close_cb(void *data EINA_UNUSED,
}
static void
-_edi_scm_ui_screens_message_open(const char *message)
+_edi_scm_ui_screens_message_open(Evas_Object *parent, const char *message)
{
Evas_Object *popup, *button;
- _edi_scm_ui_screens_message_popup = popup = elm_popup_add(_parent_obj);
+ popup = elm_popup_add(parent);
elm_object_part_text_set(popup, "title,text",
message);
@@ -105,10 +105,19 @@ _edi_scm_ui_screens_message_open(const char *message)
}
static void
-_edi_scm_ui_screens_popup_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED,
+_edi_scm_ui_screens_cancel_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- evas_object_del((Evas_Object *) data);
+ Edi_Scm_Ui *edi_scm = data;
+
+ evas_object_del(edi_scm->parent);
+
+ if (edi_scm->monitor)
+ eio_monitor_del(edi_scm->monitor);
+
+ free(edi_scm);
+
+ elm_exit();
}
static void
@@ -130,14 +139,13 @@ _edi_scm_ui_screens_commit_cb(void *data,
text = elm_object_text_get((Evas_Object *) edi_scm->commit_entry);
if (!text || !text[0])
{
-_edi_scm_ui_screens_message_open(_("Please enter a valid commit
message."));
+_edi_scm_ui_screens_message_open(edi_scm->parent, _("Please enter a
valid commit message."));
return;
}
message = elm_entry_markup_to_utf8(text);
edi_scm_commit(message);
- evas_object_del(_popup);
free(message);
if (edi_scm->monitor)
@@ -432,8 +440,6 @@ edi_scm_ui_add(Evas_Object *parent)
char *text;
Eina_Bool staged_changes;
- _parent_obj = parent;
-
if (!edi_scm_generic_init())
exit(1 << 2);
@@ -444,6 +450,7 @@ edi_scm_ui_add(Evas_Object *parent)
edi_scm = calloc(1, sizeof(Edi_Scm_Ui));
edi_scm->workdir = engine->workdir;
edi_scm->monitor = eio_monitor_add(edi_scm->workdir);
+ edi_scm->parent = parent;
ecore_event_handler_add(EIO_MONITOR_FILE_CREATED,
_edi_scm_ui_file_changes_cb, edi_scm);
ecore_event_handler_add(EIO_MONITOR_FILE_MODIFIED,
_edi_scm_ui_file_changes_cb, edi_scm);
@@ -523,7 +530,7 @@ edi_scm_ui_add(Evas_Object *parent)
elm_object_content_set(frame, hbox);
elm_box_pack_end(box, frame);
- /* File listting */
+ /* File listing */
hbox = elm_box_add(parent);
elm_box_horizontal_set(hbox, EINA_TRUE);
evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -644,7 +651,7 @@ edi_scm_ui_add(Evas_Object *parent)
evas_object_show(button);
elm_object_text_set(button, _("Cancel"));
evas_object_smart_callback_add(button, "clicked",
- _edi_scm_ui_screens_popup_cancel_cb, parent);
+ _edi_scm_ui_screens_cancel_cb, edi_scm);
elm_box_pack_end(hbox, button);
edi_scm->commit_button = button = elm_button_add(parent);
@@ -659,11 +666,5 @@ edi_scm_ui_add(Evas_Object *parent)
elm_box_pack_end(hbox, button);
elm_box_pack_end(box, hbox);
-
- if (staged_changes && edi_scm->is_configured)
- {
-elm_entry_select_all(input);
-elm_object_focus_set(input, EINA_TRUE);
- }
}
diff --git a/src/bin/edi_scm_ui.h b/src/bin/edi_scm_ui.h
index bb4be39..41dc6dd 100644
--- a/src/bin/edi_scm_ui.h
+++ b/src/bin/edi_scm_ui.h
@@ -26,7 +26,7 @@ extern "C" {
* Create the commit dialog UI.
*
* @param parent Parent object to add the commit UI to.
- * @ingroup Lookup
+ * @ingroup SCM
*/
void edi_scm_ui_add(Evas_Object *parent);
--
[EGIT] [tools/edi] master 01/01: edi_scm: Monitor for changes and update when possible
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=fad276133a56f6cd7af62ce56cfeb62acc2db7bb
commit fad276133a56f6cd7af62ce56cfeb62acc2db7bb
Author: Al Poole
Date: Sat Sep 30 12:27:19 2017 +0100
edi_scm: Monitor for changes and update when possible
Small "refactor" of the UI also to make better use of space.
---
src/bin/edi_scm_ui.c | 150 ---
1 file changed, 95 insertions(+), 55 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index a9252bf..e03279b 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -3,18 +3,27 @@
#endif
#include "Edi.h"
+#include
#include "edi_scm_ui.h"
#include "edi_private.h"
static Evas_Object *_parent_obj, *_popup, *_edi_scm_ui_screens_message_popup;
-static Evas_Object *_list, *_check;
-static Evas_Object *_commit_button, *_commit_entry;
-static Elm_Code *_code;
-static Eina_Bool scm_configured = EINA_FALSE;
-static Eina_Bool results_full = EINA_FALSE;
+typedef struct _Edi_Scm_Ui {
+ Eio_Monitor *monitor;
+ Elm_Code *code;
+ Evas_Object *list;
+ Evas_Object *check;
+ Evas_Object *commit_button;
+ Evas_Object *commit_entry;
+
+ const char *workdir;
+ Eina_Bool results_max;
+ Eina_Bool is_configured;
+
+} Edi_Scm_Ui;
-static void _edi_scm_ui_refresh(void);
+static void _edi_scm_ui_refresh(Edi_Scm_Ui *);
const char *
_edi_scm_ui_avatar_cache_path_get(const char *email)
@@ -108,6 +117,7 @@ _edi_scm_ui_screens_commit_cb(void *data,
void *event_info EINA_UNUSED)
{
Edi_Scm_Engine *engine;
+ Edi_Scm_Ui *edi_scm;
const char *text;
char *message;
@@ -116,7 +126,8 @@ _edi_scm_ui_screens_commit_cb(void *data,
if (!engine)
return;
- text = elm_object_text_get((Evas_Object *) data);
+ edi_scm = data;
+ text = elm_object_text_get((Evas_Object *) edi_scm->commit_entry);
if (!text || !text[0])
{
_edi_scm_ui_screens_message_open(_("Please enter a valid commit
message."));
@@ -129,6 +140,11 @@ _edi_scm_ui_screens_commit_cb(void *data,
evas_object_del(_popup);
free(message);
+ if (edi_scm->monitor)
+ eio_monitor_del(edi_scm->monitor);
+
+ free(edi_scm);
+
elm_exit();
}
@@ -300,13 +316,14 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
}
static Eina_Bool
-_edi_scm_ui_status_list_fill(Evas_Object *list)
+_edi_scm_ui_status_list_fill(Edi_Scm_Ui *edi_scm)
{
Elm_Genlist_Item_Class *itc;
Edi_Scm_Status *status;
Edi_Scm_Engine *e;
Eina_List *l;
Eina_Bool staged = EINA_FALSE;
+ Evas_Object *list = edi_scm->list;
e = edi_scm_engine_get();
if (!e)
@@ -323,7 +340,7 @@ _edi_scm_ui_status_list_fill(Evas_Object *list)
{
EINA_LIST_FOREACH(e->statuses, l, status)
{
- if (results_full)
+ if (edi_scm->results_max)
{
elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
}
@@ -352,41 +369,53 @@ _edi_scm_ui_status_list_fill(Evas_Object *list)
}
static void
-_edi_scm_ui_refresh(void)
+_edi_scm_ui_refresh(Edi_Scm_Ui *edi_scm)
{
char *text;
Eina_Bool staged;
- Evas_Object *check = _check;
- results_full = elm_check_state_get(check);
+ edi_scm->results_max = elm_check_state_get(edi_scm->check);
- elm_genlist_clear(_list);
- elm_code_file_clear(_code->file);
+ elm_genlist_clear(edi_scm->list);
+ elm_code_file_clear(edi_scm->code->file);
- staged = _edi_scm_ui_status_list_fill(_list);
+ staged = _edi_scm_ui_status_list_fill(edi_scm);
- if (!scm_configured)
+ if (!edi_scm->is_configured)
{
-elm_object_disabled_set(_commit_button, EINA_TRUE);
-elm_entry_editable_set(_commit_entry, EINA_FALSE);
+elm_object_disabled_set(edi_scm->commit_button, EINA_TRUE);
+elm_entry_editable_set(edi_scm->commit_entry, EINA_FALSE);
}
else
{
- elm_object_disabled_set(_commit_button, !staged);
- elm_entry_editable_set(_commit_entry, staged);
+ elm_object_disabled_set(edi_scm->commit_button, !staged);
+ elm_entry_editable_set(edi_scm->commit_entry, staged);
}
- elm_genlist_realized_items_update(_list);
+ elm_genlist_realized_items_update(edi_scm->list);
- text = edi_scm_diff(!results_full);
- _entry_lines_append(_code, text);
+ text = edi_scm_diff(!edi_scm->results_max);
+ _entry_lines_append(edi_scm->code, text);
free(text);
}
static void
_edi_scm_ui_refresh_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- _edi_scm_ui_refresh();
+ Edi_Scm_Ui *edi_scm = data;
+
+ _edi_scm_ui_refresh(edi_scm);
+}
+
+static Eina_Bool
+_edi_scm_ui_file_changes_cb(void *data EINA_U
[EGIT] [tools/edi] master 01/01: edi_scm: pack list and commit dialogue on same line.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=e623190fa39148e922d02f8e2b174ec6f1c1ce63
commit e623190fa39148e922d02f8e2b174ec6f1c1ce63
Author: Al Poole
Date: Sat Sep 30 10:05:04 2017 +0100
edi_scm: pack list and commit dialogue on same line.
This gives a much wider space to display the diff output.
---
src/bin/edi_scm_ui.c | 53
1 file changed, 24 insertions(+), 29 deletions(-)
diff --git a/src/bin/edi_scm_ui.c b/src/bin/edi_scm_ui.c
index 8dd41fe..a9252bf 100644
--- a/src/bin/edi_scm_ui.c
+++ b/src/bin/edi_scm_ui.c
@@ -393,7 +393,7 @@ void
edi_scm_ui_add(Evas_Object *parent)
{
Evas_Object *box, *frame, *hbox, *cbox, *label, *avatar, *input, *button;
- Evas_Object *table, *rect, *list, *pbox, *check;
+ Evas_Object *table, *rect, *list, *pbox, *check, *sep;
Elm_Code_Widget *entry;
Elm_Code *code;
Eina_Strbuf *string;
@@ -405,19 +405,11 @@ edi_scm_ui_add(Evas_Object *parent)
_parent_obj = parent;
if (!edi_scm_generic_init())
- {
- exit(1 << 2);
-// _edi_scm_ui_screens_message_open(_("SCM is not available at this
location."));
- return;
- }
+ exit(1 << 2);
engine = edi_scm_engine_get();
if (!engine)
- {
-exit(1 << 3);
- // _edi_scm_ui_screens_message_open(_("SCM engine is not available."));
-return;
- }
+ exit(1 << 3);
box = elm_box_add(parent);
elm_box_horizontal_set(box, EINA_FALSE);
@@ -433,13 +425,6 @@ edi_scm_ui_add(Evas_Object *parent)
evas_object_show(hbox);
/* General information*/
- frame = elm_frame_add(hbox);
- elm_object_text_set(frame, _("Summary"));
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_object_content_set(frame, hbox);
- evas_object_show(frame);
- elm_box_pack_end(box, frame);
label = elm_label_add(hbox);
evas_object_size_hint_weight_set(label, EVAS_HINT_EXPAND, 0.0);
@@ -473,6 +458,7 @@ edi_scm_ui_add(Evas_Object *parent)
elm_object_text_set(label, eina_strbuf_string_get(string));
eina_strbuf_free(string);
+ elm_box_pack_end(box, hbox);
/* Options */
hbox = elm_box_add(parent);
@@ -492,15 +478,17 @@ edi_scm_ui_add(Evas_Object *parent)
evas_object_show(hbox);
evas_object_smart_callback_add(check, "changed",
_edi_scm_ui_refresh_cb, NULL);
+ elm_box_pack_end(box, hbox);
+ sep = elm_separator_add(parent);
+ elm_separator_horizontal_set(sep, EINA_TRUE);
+ evas_object_show(sep);
+ elm_box_pack_end(box, sep);
- frame = elm_frame_add(parent);
- elm_object_text_set(frame, _("Options"));
- elm_object_content_set(frame, hbox);
- evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND, 0.0);
- evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_show(frame);
- elm_box_pack_end(box, frame);
-
+ hbox = elm_box_add(parent);
+ elm_box_horizontal_set(hbox, EINA_TRUE);
+ evas_object_size_hint_weight_set(hbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(hbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ evas_object_show(hbox);
/* File listting */
_list = list = elm_genlist_add(box);
elm_genlist_mode_set(list, ELM_LIST_SCROLL);
@@ -529,7 +517,8 @@ edi_scm_ui_add(Evas_Object *parent)
elm_object_content_set(frame, table);
elm_table_pack(table, list, 0, 0, 1, 1);
elm_object_content_set(frame, table);
- elm_box_pack_end(box, frame);
+ elm_box_pack_end(hbox, frame);
+ elm_box_pack_end(box, hbox);
staged_changes = _edi_scm_ui_status_list_fill(list);
@@ -564,7 +553,8 @@ edi_scm_ui_add(Evas_Object *parent)
evas_object_show(input);
elm_object_content_set(frame, table);
- elm_box_pack_end(box, frame);
+ elm_box_pack_end(hbox, frame);
+ elm_box_pack_end(box, hbox);
/* Start of elm_code diff widget */
frame = elm_frame_add(parent);
@@ -576,7 +566,7 @@ edi_scm_ui_add(Evas_Object *parent)
cbox = elm_box_add(parent);
evas_object_size_hint_weight_set(cbox, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(cbox, EVAS_HINT_FILL, EVAS_HINT_FILL);
- evas_object_size_hint_min_set(cbox, 350 * elm_config_scale_get(), 250 *
elm_config_scale_get());
+ evas_object_size_hint_min_set(cbox, 350 * elm_config_scale_get(), 150 *
elm_config_scale_get());
evas_object_show(cbox);
elm_object_content_set(frame, cbox);
elm_box_pack_end(box, frame);
@@ -596,6 +586,11 @@ edi_scm_ui_add(Evas_Object *parent)
_entry_lines_append(code, text);
free(text);
+ sep = elm_separator_add(parent);
+ elm_separator_horizontal_set(sep, EINA_TRUE);
+ evas_object_show(sep);
+ elm_box_pack_end(box, sep);
+
[EGIT] [tools/edi] master 01/01: filepanel: simplify code by using existing method.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=e5aca41ad1db95bcd00c1bca71b7630b3d22bbcb commit e5aca41ad1db95bcd00c1bca71b7630b3d22bbcb Author: Al Poole Date: Sat Sep 30 00:28:53 2017 +0100 filepanel: simplify code by using existing method. --- src/bin/edi_filepanel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c index bd5f6f6..da644cd 100644 --- a/src/bin/edi_filepanel.c +++ b/src/bin/edi_filepanel.c @@ -301,8 +301,7 @@ _item_menu_open_panel_cb(void *data, Evas_Object *obj EINA_UNUSED, Edi_Path_Options *options; Edi_Dir_Data *sd = data; - if (edi_mainview_panel_count() == 1 && - (edi_mainview_panel_item_count(edi_mainview_panel_by_index(0)) == 0)) + if (edi_mainview_is_empty()) panel = edi_mainview_panel_by_index(0); else panel = edi_mainview_panel_append(); --
[EGIT] [tools/edi] master 01/01: edi_scm: win title.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=448b0b164d900a8a6d66699e5b9f99340be3f376 commit 448b0b164d900a8a6d66699e5b9f99340be3f376 Author: Al Poole Date: Fri Sep 29 22:14:01 2017 +0100 edi_scm: win title. Sorry! Ugh --- src/bin/edi_scm_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/edi_scm_main.c b/src/bin/edi_scm_main.c index 40bcddc..2a0cd94 100644 --- a/src/bin/edi_scm_main.c +++ b/src/bin/edi_scm_main.c @@ -25,7 +25,7 @@ _setup_win(void) elm_policy_set(ELM_POLICY_QUIT, ELM_POLICY_QUIT_LAST_WINDOW_CLOSED); - win = elm_win_util_standard_add(eina_strbuf_string_get(title), ELM_WIN_BASIC); + win = elm_win_util_standard_add(eina_strbuf_string_get(title), eina_strbuf_string_get(title)); icon = elm_icon_add(win); elm_icon_standard_set(icon, "edi"); elm_win_icon_object_set(win, icon); --
[EGIT] [tools/edi] master 01/01: scm: Actually allow for checking of scm anywhere within a git tree.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=9e7999b50017f00a50531423da75dd8c7b2c16cb
commit 9e7999b50017f00a50531423da75dd8c7b2c16cb
Author: Al Poole
Date: Fri Sep 29 22:08:24 2017 +0100
scm: Actually allow for checking of scm anywhere within a git tree.
---
src/lib/edi_scm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index 46eae75..cfbd0ae 100644
--- a/src/lib/edi_scm.c
+++ b/src/lib/edi_scm.c
@@ -753,7 +753,7 @@ _edi_scm_git_init()
EAPI Edi_Scm_Engine *
edi_scm_generic_init(void)
{
- if (ecore_file_exists(".git"))
+ if (!edi_exe_wait("git status"))
return _edi_scm_git_init();
return NULL;
--
[EGIT] [tools/edi] master 01/01: scm: header file function erroneous description.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=3397bc93e6bf36362ef99df44f935fa56ef90801
commit 3397bc93e6bf36362ef99df44f935fa56ef90801
Author: Al Poole
Date: Fri Sep 29 21:42:49 2017 +0100
scm: header file function erroneous description.
---
src/bin/edi_scm_ui.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/edi_scm_ui.h b/src/bin/edi_scm_ui.h
index ac394fd..bb4be39 100644
--- a/src/bin/edi_scm_ui.h
+++ b/src/bin/edi_scm_ui.h
@@ -23,9 +23,9 @@ extern "C" {
*/
/**
- * Check the path is not hidden according to project rules.
+ * Create the commit dialog UI.
*
- * @param path The file path to check.
+ * @param parent Parent object to add the commit UI to.
* @ingroup Lookup
*/
void edi_scm_ui_add(Evas_Object *parent);
--
[EGIT] [tools/edi] master 01/01: scm: Create edi_scm binary for commit dialogue and use elsewhere.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=be53c4df18efeac9c32234c972e00e2e12d178db
commit be53c4df18efeac9c32234c972e00e2e12d178db
Author: Al Poole
Date: Fri Sep 29 21:37:21 2017 +0100
scm: Create edi_scm binary for commit dialogue and use elsewhere.
This removes the existing popup code. The edi_scm executable should
run in any git tree giving the status of the repository. The Edi
UI calls this for the commit dialogue also.
---
src/bin/Makefile.am| 11 +-
src/bin/edi_main.c | 22 +-
src/bin/edi_scm_main.c | 60 +++
.../{screens/edi_scm_screens.c => edi_scm_ui.c}| 445 -
src/bin/edi_scm_ui.h | 44 ++
src/bin/screens/edi_scm_screens.h | 61 ---
src/bin/screens/edi_screens.c | 26 ++
src/bin/screens/edi_screens.h | 10 +
src/lib/edi_scm.c | 16 +-
src/lib/edi_scm.h | 8 +
10 files changed, 453 insertions(+), 250 deletions(-)
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 1c23023..aa32e74 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
AUTOMAKE_OPTIONS = subdir-objects
-bin_PROGRAMS = edi edi_build
+bin_PROGRAMS = edi edi_build edi_scm
efl_cflags_safe = '@EFL_CFLAGS@'
clang_include = '$(CLANG_INCLUDE)'
@@ -27,9 +27,9 @@ editor/edi_editor.h \
edi_content_provider.h \
screens/edi_screens.h \
screens/edi_file_screens.h \
-screens/edi_scm_screens.h \
edi_filepanel.h \
edi_file.h \
+edi_scm_ui.h \
edi_logpanel.h \
edi_searchpanel.h \
edi_consolepanel.h \
@@ -50,10 +50,10 @@ screens/edi_about.c \
screens/edi_settings_font.c \
screens/edi_settings.c \
screens/edi_file_screens.c \
-screens/edi_scm_screens.c \
screens/edi_screens.c \
edi_filepanel.c \
edi_file.c \
+edi_scm_ui.c \
edi_logpanel.c \
edi_searchpanel.c \
edi_consolepanel.c \
@@ -73,6 +73,9 @@ edi_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la
$(LTLIBINTL)
edi_build_SOURCES = \
edi_build_main.c
-
edi_build_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la
+edi_scm_SOURCES = \
+edi_scm_ui.c \
+edi_scm_main.c
+edi_scm_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libedi.la
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index f7d8da5..62f6a26 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -22,7 +22,6 @@
#include "mainview/edi_mainview.h"
#include "screens/edi_screens.h"
#include "screens/edi_file_screens.h"
-#include "screens/edi_scm_screens.h"
#include "screens/edi_screens.h"
#include "edi_private.h"
@@ -1017,7 +1016,7 @@ _edi_menu_scm_init_cb(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
if (!ecore_file_app_installed("git"))
{
-edi_scm_screens_binary_missing(_edi_main_win, "git");
+edi_screens_scm_binary_missing(_edi_main_win, "git");
return;
}
@@ -1031,9 +1030,17 @@ _edi_menu_scm_init_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
}
static void
+_edi_scm_program_exited_cb(int status EINA_UNUSED, void *data EINA_UNUSED)
+{
+ edi_filepanel_status_refresh();
+}
+
+static void
_edi_menu_scm_commit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
+ char *workdir = getcwd(NULL, PATH_MAX);
+
if (!_edi_project_credentials_check())
{
_edi_project_credentials_missing();
@@ -1041,7 +1048,16 @@ _edi_menu_scm_commit_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
}
edi_scm_credentials_set(_edi_project_config->user_fullname,
_edi_project_config->user_email);
- edi_scm_screens_commit(_edi_main_win);
+
+ chdir(edi_project_get());
+
+ /* when program terminates update the filepanel */
+ if (edi_exe_notify_handle("edi_scm_status", _edi_scm_program_exited_cb,
NULL))
+ edi_exe_notify("edi_scm_status", "edi_scm");
+
+ chdir(workdir);
+
+ free(workdir);
}
static void
diff --git a/src/bin/edi_scm_main.c b/src/bin/edi_scm_main.c
new file mode 100644
index 000..40bcddc
--- /dev/null
+++ b/src/bin/edi_scm_main.c
@@ -0,0 +1,60 @@
+#include
+#include "edi_scm_ui.h"
+
+#define DEFAULT_WIDTH 460
+#define DEFAULT_HEIGHT 280
+
+static void
+_win_del_cb(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ evas_object_del(obj);
+ ecore_main_loop_quit();
+}
+
+static Evas_Object *
+_setup_win(void)
+{
+ Evas_Object *win, *icon;
+ Eina_Strbuf *title;
+ char *cwd;
+
+ cwd = getcwd(NULL, PATH_MAX);
+
+ title = eina_strbuf_new();
+ eina_strbuf_append_printf(title, "Edi Source Control :: %s&qu
[EGIT] [tools/edi] master 01/01: welcome: don't show progressbar until downloaing.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=f66ef895b847d56aaa483772a34bdae1196156fe
commit f66ef895b847d56aaa483772a34bdae1196156fe
Author: Al Poole
Date: Thu Sep 28 22:32:23 2017 +0100
welcome: don't show progressbar until downloaing.
---
src/bin/screens/edi_welcome.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/screens/edi_welcome.c b/src/bin/screens/edi_welcome.c
index c47171c..07347b6 100644
--- a/src/bin/screens/edi_welcome.c
+++ b/src/bin/screens/edi_welcome.c
@@ -462,6 +462,7 @@ _edi_welcome_clone_thread_end_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
Edi_Welcome_Data *wd = data;
elm_progressbar_pulse(wd->pb, EINA_FALSE);
+ evas_object_hide(wd->pb);
elm_object_disabled_set(wd->button, EINA_FALSE);
if (wd->status)
@@ -500,6 +501,7 @@ _edi_welcome_project_clone_click_cb(void *data EINA_UNUSED,
Evas_Object *obj EIN
elm_object_disabled_set(wd->button, EINA_TRUE);
elm_progressbar_pulse(wd->pb, EINA_TRUE);
+ evas_object_show(wd->pb);
ecore_thread_run(_edi_welcome_clone_thread_run_cb,
_edi_welcome_clone_thread_end_cb, NULL, wd);
}
@@ -526,7 +528,6 @@ _edi_welcome_project_clone_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *ev
evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_table_pack(content, pb, 0, row++, _EDI_WELCOME_PROJECT_NEW_TABLE_WIDTH,
1);
elm_progressbar_pulse_set(pb, EINA_TRUE);
- evas_object_show(pb);
button = elm_button_add(content);
elm_object_text_set(button, _("Checkout"));
--
[EGIT] [tools/edi] master 01/01: welcome: Add progressbar during retrievel of remote repository.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=b2e69bebb951c4ecc0e87216432e81b4482ae003
commit b2e69bebb951c4ecc0e87216432e81b4482ae003
Author: Al Poole
Date: Thu Sep 28 14:27:54 2017 +0100
welcome: Add progressbar during retrievel of remote repository.
This gives an indicator to the user the download is in progress.
Moreover it stops the UI from freezing up with a large remote
repository.
---
src/bin/screens/edi_welcome.c | 71 ---
1 file changed, 60 insertions(+), 11 deletions(-)
diff --git a/src/bin/screens/edi_welcome.c b/src/bin/screens/edi_welcome.c
index a641d1e..c47171c 100644
--- a/src/bin/screens/edi_welcome.c
+++ b/src/bin/screens/edi_welcome.c
@@ -448,31 +448,68 @@ _edi_welcome_project_new_cb(void *data, Evas_Object *obj
EINA_UNUSED, void *even
elm_naviframe_item_title_enabled_set(item, EINA_TRUE, EINA_TRUE);
}
+typedef struct _Edi_Welcome_Data {
+ Evas_Object *pb;
+ Evas_Object *button;
+ char *dir;
+ char *url;
+ int status;
+} Edi_Welcome_Data;
+
+static void
+_edi_welcome_clone_thread_end_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
+{
+ Edi_Welcome_Data *wd = data;
+
+ elm_progressbar_pulse(wd->pb, EINA_FALSE);
+ elm_object_disabled_set(wd->button, EINA_FALSE);
+
+ if (wd->status)
+ _edi_message_open(_("Unable to clone project, please check URL or try
again later"), EINA_TRUE);
+ else
+ _edi_welcome_project_open(wd->dir, EINA_FALSE);
+
+ free(wd->dir);
+ free(wd->url);
+
+ if (!wd->status)
+ free(wd);
+}
+
+static void
+_edi_welcome_clone_thread_run_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
+{
+ Edi_Welcome_Data *wd = data;
+
+ wd->status = edi_scm_git_clone(wd->url, wd->dir);
+}
+
static void
_edi_welcome_project_clone_click_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *entry;
- const char *url, *parent, *name, *dir;
- int status;
+ const char *parent, *name;
+ Edi_Welcome_Data *wd = data;
entry = elm_layout_content_get(_create_inputs[1], "elm.swallow.entry");
parent = elm_object_text_get(entry);
name = elm_object_text_get(_create_inputs[2]);
- url = elm_object_text_get(_create_inputs[0]);
- dir = edi_path_append(parent, name);
- status = edi_scm_git_clone(url, dir);
- if (status)
- _edi_message_open(_("Unable to clone project, please check URL or try
again later"), EINA_TRUE);
- else
- _edi_welcome_project_open(dir, EINA_FALSE);
+ wd->dir = edi_path_append(parent, name);
+ wd->url = strdup(elm_object_text_get(_create_inputs[0]));
+
+ elm_object_disabled_set(wd->button, EINA_TRUE);
+ elm_progressbar_pulse(wd->pb, EINA_TRUE);
+
+ ecore_thread_run(_edi_welcome_clone_thread_run_cb,
_edi_welcome_clone_thread_end_cb, NULL, wd);
}
static void
_edi_welcome_project_clone_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
{
- Evas_Object *content, *button, *naviframe = data;
+ Evas_Object *content, *pb, *button, *naviframe = data;
Elm_Object_Item *item;
+ Edi_Welcome_Data *wd;
int row = 0;
content = elm_table_add(naviframe);
@@ -484,13 +521,25 @@ _edi_welcome_project_clone_cb(void *data, Evas_Object
*obj EINA_UNUSED, void *ev
_edi_welcome_project_new_directory_row_add(_("Parent Path"), row++,
content);
_edi_welcome_project_new_input_row_add(_("Project Name"), NULL, row++,
content);
+ pb = elm_progressbar_add(content);
+ evas_object_size_hint_align_set(pb, EVAS_HINT_FILL, 0.5);
+ evas_object_size_hint_weight_set(pb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_table_pack(content, pb, 0, row++, _EDI_WELCOME_PROJECT_NEW_TABLE_WIDTH,
1);
+ elm_progressbar_pulse_set(pb, EINA_TRUE);
+ evas_object_show(pb);
+
button = elm_button_add(content);
elm_object_text_set(button, _("Checkout"));
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);
evas_object_show(button);
elm_table_pack(content, button, _EDI_WELCOME_PROJECT_NEW_TABLE_WIDTH - 2,
row, 2, 1);
- evas_object_smart_callback_add(button, "clicked",
_edi_welcome_project_clone_click_cb, NULL);
+
+ wd = malloc(sizeof(Edi_Welcome_Data));
+ wd->button = button;
+ wd->pb = pb;
+
+ evas_object_smart_callback_add(button, "clicked",
_edi_welcome_project_clone_click_cb, wd);
item = elm_naviframe_item_push(naviframe, _("Checkout Existing Project"),
NULL, NULL, content, NULL);
--
[EGIT] [tools/edi] master 01/01: edi_file: use a static buffer for the path.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=3eadca948cf796538f01e6d6241b5caa66d57aed
commit 3eadca948cf796538f01e6d6241b5caa66d57aed
Author: Al Poole
Date: Thu Sep 28 01:39:49 2017 +0100
edi_file: use a static buffer for the path.
---
src/bin/edi_file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/bin/edi_file.c b/src/bin/edi_file.c
index f9e960d..a67e79e 100644
--- a/src/bin/edi_file.c
+++ b/src/bin/edi_file.c
@@ -20,9 +20,10 @@ edi_file_path_hidden(const char *path)
void
edi_file_text_replace(const char *path, const char *search, const char
*replace)
{
- char *map, *tempfilepath, *found;
+ char *map, *found;
FILE *tempfile;
Eina_File *f;
+ char tempfilepath[PATH_MAX];
unsigned long long len, idx;
unsigned int slen;
@@ -43,8 +44,7 @@ edi_file_text_replace(const char *path, const char *search,
const char *replace)
return;
}
- tempfilepath = malloc(strlen(path)) + 5;
- sprintf(tempfilepath, "/tmp/%s.tmp", ecore_file_file_get(path));
+ snprintf(tempfilepath, sizeof(tempfilepath), "/tmp/%s.tmp",
ecore_file_file_get(path));
tempfile = fopen(tempfilepath, "wb");
if (!tempfile) goto done;
--
[EGIT] [tools/edi] master 01/01: search: Add project-wide search and replace feature.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=c826dee557ba7c9202418373500af471308a749a
commit c826dee557ba7c9202418373500af471308a749a
Author: Al Poole
Date: Thu Sep 28 01:23:18 2017 +0100
search: Add project-wide search and replace feature.
---
src/bin/edi_file.c | 101 +
src/bin/edi_file.h | 21 ++
src/bin/edi_main.c | 8 ++
src/bin/mainview/edi_mainview.c | 160 +++-
src/bin/mainview/edi_mainview.h | 8 ++
5 files changed, 296 insertions(+), 2 deletions(-)
diff --git a/src/bin/edi_file.c b/src/bin/edi_file.c
index fe7ada0..f9e960d 100644
--- a/src/bin/edi_file.c
+++ b/src/bin/edi_file.c
@@ -17,3 +17,104 @@ edi_file_path_hidden(const char *path)
return EINA_FALSE;
}
+void
+edi_file_text_replace(const char *path, const char *search, const char
*replace)
+{
+ char *map, *tempfilepath, *found;
+ FILE *tempfile;
+ Eina_File *f;
+ unsigned long long len, idx;
+ unsigned int slen;
+
+ f = eina_file_open(path, EINA_FALSE);
+ if (!f) return;
+
+ map = eina_file_map_all(f, EINA_FILE_POPULATE);
+ if (!map)
+ {
+eina_file_close(f);
+return;
+ }
+
+ len = eina_file_size_get(f);
+ if (!len)
+ {
+eina_file_close(f);
+return;
+ }
+
+ tempfilepath = malloc(strlen(path)) + 5;
+ sprintf(tempfilepath, "/tmp/%s.tmp", ecore_file_file_get(path));
+
+ tempfile = fopen(tempfilepath, "wb");
+ if (!tempfile) goto done;
+
+ idx = 0;
+
+ found = strstr(&map[idx], search);
+ if (!found)
+ {
+fclose(tempfile);
+unlink(tempfilepath);
+goto done;
+ }
+
+ slen = strlen(search);
+
+ while (idx < len)
+ {
+ if (!found || &map[idx] < found)
+ {
+ fprintf(tempfile, "%c", map[idx]);
+ idx++;
+ }
+ else
+ {
+ fprintf(tempfile, "%s", replace);
+ idx += slen;
+ found = strstr(&map[idx], search);
+ }
+ }
+
+ fclose(tempfile);
+ ecore_file_mv(tempfilepath, path);
+done:
+ eina_file_map_free(f, map);
+ eina_file_close(f);
+}
+
+static void
+_edi_file_text_replace_all(const char *directory, const char *search, const
char *replace)
+{
+ char *path, *file;
+ Eina_List *files;
+
+ files = ecore_file_ls(directory);
+
+ EINA_LIST_FREE(files, file)
+ {
+path = edi_path_append(directory, file);
+if (!edi_file_path_hidden(path))
+ {
+ if (ecore_file_is_dir(path))
+ {
+ _edi_file_text_replace_all(path, search, replace);
+ }
+ else
+ {
+ edi_file_text_replace(path, search, replace);
+ }
+ }
+free(path);
+free(file);
+ }
+
+ if (files)
+ eina_list_free(files);
+}
+
+void
+edi_file_text_replace_all(const char *search, const char *replace)
+{
+ _edi_file_text_replace_all(edi_project_get(), search, replace);
+}
diff --git a/src/bin/edi_file.h b/src/bin/edi_file.h
index 2c0e587..f3fffd9 100644
--- a/src/bin/edi_file.h
+++ b/src/bin/edi_file.h
@@ -32,6 +32,27 @@ extern "C" {
Eina_Bool edi_file_path_hidden(const char *path);
/**
+ * Replace all occurences of text within whole project.
+ *
+ * @param search The text to be replaced.
+ * @param replace The text that will replace.
+ *
+ * @ingroup Lookup
+ */
+void edi_file_text_replace_all(const char *search, const char *replace);
+
+/**
+ * Replace all occurences of text within given file.
+ *
+ * @param path The path of the file to replace all occurences of the text.
+ * @param search The text to be replaced.
+ * @param replace The text that will replace.
+ *
+ * @ingroup Lookup
+ */
+void edi_file_text_replace(const char *path, const char *search, const char
*replace);
+
+/**
* @}
*/
diff --git a/src/bin/edi_main.c b/src/bin/edi_main.c
index 62dedfa..f7d8da5 100644
--- a/src/bin/edi_main.c
+++ b/src/bin/edi_main.c
@@ -927,6 +927,13 @@ _edi_menu_find_project_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
}
static void
+_edi_menu_find_replace_project_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ edi_mainview_project_replace_popup_show();
+}
+
+static void
_edi_menu_findfile_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
@@ -1137,6 +1144,7 @@ _edi_menu_setup(Evas_Object *win)
elm_menu_item_add(menu, menu_it, "go-jump", _("Goto Line ..."),
_edi_menu_goto_cb, NULL);
elm_menu_item_separator_add(menu, menu_it);
elm_menu_item_add(menu, menu_it, "edit-find", _("Find in project ..."),
_edi_
[EGIT] [tools/edi] master 01/01: screens: scm. Stylistic changes.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=5cefe27e48ff7ea7c0fe4a2a39b0d4529bd274ef
commit 5cefe27e48ff7ea7c0fe4a2a39b0d4529bd274ef
Author: Al Poole
Date: Wed Sep 27 20:01:14 2017 +0100
screens: scm. Stylistic changes.
---
src/bin/screens/edi_scm_screens.c | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/bin/screens/edi_scm_screens.c
b/src/bin/screens/edi_scm_screens.c
index dcae40f..e10b33c 100644
--- a/src/bin/screens/edi_scm_screens.c
+++ b/src/bin/screens/edi_scm_screens.c
@@ -137,7 +137,7 @@ _icon_status(Edi_Scm_Status_Code code)
}
static void
-_file_status_free(Edi_Scm_Status *status)
+_edi_scm_status_free(Edi_Scm_Status *status)
{
eina_stringshare_del(status->fullpath);
eina_stringshare_del(status->path);
@@ -151,7 +151,7 @@ _content_del(void *data, Evas_Object *obj EINA_UNUSED)
{
Edi_Scm_Status *status = data;
- _file_status_free(status);
+ _edi_scm_status_free(status);
}
static Evas_Object *
@@ -267,11 +267,13 @@ _file_status_list_fill(Evas_Object *list)
{
if (status->staged)
{
- staged = EINA_TRUE;
elm_genlist_item_append(list, itc, status, NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ staged = EINA_TRUE;
}
else
- _file_status_free(status);
+ {
+ _edi_scm_status_free(status);
+ }
}
}
--
[EGIT] [tools/edi] master 01/01: scm: refactor scm screens.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=c75c2d817f1b38f433088c8fc10b0df979cbfc98
commit c75c2d817f1b38f433088c8fc10b0df979cbfc98
Author: Al Poole
Date: Wed Sep 27 19:46:09 2017 +0100
scm: refactor scm screens.
There's absolutely zero need for a hash table here.
Refactor the scm commit screen to be more efficient and make more
sense.
---
src/bin/screens/edi_scm_screens.c | 89 ---
1 file changed, 26 insertions(+), 63 deletions(-)
diff --git a/src/bin/screens/edi_scm_screens.c
b/src/bin/screens/edi_scm_screens.c
index 45cc5c0..dcae40f 100644
--- a/src/bin/screens/edi_scm_screens.c
+++ b/src/bin/screens/edi_scm_screens.c
@@ -12,7 +12,6 @@
#include "edi_private.h"
static Evas_Object *_parent_obj, *_popup, *_edi_scm_screens_message_popup;
-static Eina_Hash *_hash_statuses = NULL;
static void
_edi_scm_screens_message_close_cb(void *data EINA_UNUSED,
@@ -106,60 +105,29 @@ _entry_lines_append(Elm_Code *code, char *text)
elm_code_file_line_append(code->file, start, end - start, NULL);
}
-static Edi_Scm_Status_Code *
-_file_status_item_find(const char *path)
-{
- return eina_hash_find(_hash_statuses, path);
-}
-
-static void
-_file_status_item_add(const char *path, Edi_Scm_Status_Code status)
-{
- Edi_Scm_Status_Code *code;
-
- if (_file_status_item_find(path)) return;
-
- code = malloc(sizeof(Edi_Scm_Status_Code));
-
- *code = status;
- eina_hash_add(_hash_statuses, path, code);
-}
-
-
-static void _list_status_free_cb(void *data)
-{
- Edi_Scm_Status_Code *code = data;
-
- free(code);
-}
-
static const char *
-_icon_status(Edi_Scm_Status_Code code, Eina_Bool *staged)
+_icon_status(Edi_Scm_Status_Code code)
{
switch (code)
{
case EDI_SCM_STATUS_NONE:
+case EDI_SCM_STATUS_UNKNOWN:
+ return NULL;
case EDI_SCM_STATUS_RENAMED:
return "document-new";
case EDI_SCM_STATUS_DELETED:
return "edit-delete";
-case EDI_SCM_STATUS_UNKNOWN:
- return NULL;
case EDI_SCM_STATUS_RENAMED_STAGED:
- *staged = EINA_TRUE;
return "document-new";
case EDI_SCM_STATUS_DELETED_STAGED:
- *staged = EINA_TRUE;
return "edit-delete";
case EDI_SCM_STATUS_ADDED:
return "document-new";
case EDI_SCM_STATUS_ADDED_STAGED:
- *staged = EINA_TRUE;
return "document-new";
case EDI_SCM_STATUS_MODIFIED:
return "document-save-as";
case EDI_SCM_STATUS_MODIFIED_STAGED:
- *staged = EINA_TRUE;
return "document-save-as";
case EDI_SCM_STATUS_UNTRACKED:
return "dialog-question";
@@ -169,32 +137,36 @@ _icon_status(Edi_Scm_Status_Code code, Eina_Bool *staged)
}
static void
+_file_status_free(Edi_Scm_Status *status)
+{
+ eina_stringshare_del(status->fullpath);
+ eina_stringshare_del(status->path);
+ eina_stringshare_del(status->unescaped);
+
+ free(status);
+}
+
+static void
_content_del(void *data, Evas_Object *obj EINA_UNUSED)
{
- char *path = data;
+ Edi_Scm_Status *status = data;
- free(path);
+ _file_status_free(status);
}
static Evas_Object *
_content_get(void *data, Evas_Object *obj, const char *source)
{
Evas_Object *box, *lbox, *mbox, *rbox, *label, *ic;
- Edi_Scm_Status_Code *code;
+ Edi_Scm_Status *status;
const char *text, *icon_name, *icon_status;
- char *path;
- Eina_Bool staged = EINA_FALSE;
if (strcmp(source, "elm.swallow.content"))
return NULL;
- path = (char *) data;
+ status = (Edi_Scm_Status *) data;
- icon_name = icon_status = NULL;
-
- code = _file_status_item_find(path);
- if (code)
- icon_status = _icon_status(*code, &staged);
+ icon_status = _icon_status(status->change);
icon_name = "dialog-information";
@@ -214,7 +186,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_box_pack_end(lbox, ic);
label = elm_label_add(lbox);
- elm_object_text_set(label, path);
+ elm_object_text_set(label, status->unescaped);
evas_object_show(label);
elm_box_pack_end(lbox, label);
@@ -236,7 +208,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_show(ic);
elm_box_pack_end(rbox, ic);
-if (staged)
+if (status->staged)
{
ic = elm_icon_add(mbox);
elm_icon_standard_set(ic, "dialog-information");
@@ -253,7 +225,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
evas_object_show(ic);
elm_box_pack_end(rbox, ic);
- if (*code != EDI_SCM_STATUS_UNTRACKED)
+ if (status->change != E
[EGIT] [tools/edi] master 01/02: edi: escape paths where necessary.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=e86760b802ace859ec9c29c8d4fcaf1a0d849d54
commit e86760b802ace859ec9c29c8d4fcaf1a0d849d54
Author: Al Poole
Date: Wed Sep 27 19:42:45 2017 +0100
edi: escape paths where necessary.
---
src/bin/edi_filepanel.c| 8 +++--
src/bin/screens/edi_file_screens.c | 20 ---
src/lib/edi_scm.c | 68 ++
src/lib/edi_scm.h | 1 +
4 files changed, 76 insertions(+), 21 deletions(-)
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 7ad0f7c..bd5f6f6 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -184,6 +184,7 @@ edi_filepanel_scm_status_update(void)
_file_status_item_add(status->fullpath, status->change);
eina_stringshare_del(status->path);
eina_stringshare_del(status->fullpath);
+ eina_stringshare_del(status->unescaped);
free(status);
}
eina_list_free(e->statuses);
@@ -609,7 +610,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
Edi_Dir_Data *sd = data;
Evas_Object *box, *lbox, *mbox, *rbox, *label, *ic;
Edi_Scm_Status_Code *code;
- char *text;
+ char *text, *escaped;
const char *icon_name, *icon_status;
Eina_Bool staged = EINA_FALSE;
@@ -618,10 +619,13 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
text = NULL; icon_name = icon_status = NULL;
- code = _file_status_item_find(sd->path);
+ escaped = ecore_file_escape_name(sd->path);
+ code = _file_status_item_find(escaped);
if (code)
icon_status = _icon_status(*code, &staged);
+ free(escaped);
+
text = strdup(basename((char *)sd->path));
provider = _get_provider_from_hashset(sd->path);
diff --git a/src/bin/screens/edi_file_screens.c
b/src/bin/screens/edi_file_screens.c
index ebe18a6..5e9233f 100644
--- a/src/bin/screens/edi_file_screens.c
+++ b/src/bin/screens/edi_file_screens.c
@@ -49,6 +49,7 @@ _edi_file_screens_create_file_cb(void *data,
void *event_info EINA_UNUSED)
{
const char *name;
+ char *text;
char *path;
const char *directory = _directory_path;
FILE *f;
@@ -63,7 +64,9 @@ _edi_file_screens_create_file_cb(void *data,
return;
}
- path = edi_path_append(directory, name);
+ text = elm_entry_markup_to_utf8(name);
+
+ path = edi_path_append(directory, text);
if ((ecore_file_exists(path) && ecore_file_is_dir(path)) ||
!ecore_file_exists(path))
{
@@ -82,6 +85,7 @@ _edi_file_screens_create_file_cb(void *data,
evas_object_del(_popup);
free(path);
+ free(text);
}
static void
@@ -90,7 +94,7 @@ _edi_file_screens_create_dir_cb(void *data,
void *event_info EINA_UNUSED)
{
const char *name;
- char *path;
+ char *path, *text;
const char *directory = _directory_path;
if (!ecore_file_is_dir(directory)) return;
@@ -102,7 +106,9 @@ _edi_file_screens_create_dir_cb(void *data,
return;
}
- path = edi_path_append(directory, name);
+ text = elm_entry_markup_to_utf8(name);
+
+ path = edi_path_append(directory, text);
mkdir(path, 0755);
@@ -111,6 +117,7 @@ _edi_file_screens_create_dir_cb(void *data,
evas_object_del(_popup_dir);
free(path);
+ free(text);
}
static void
@@ -120,7 +127,7 @@ _edi_file_screens_rename_cb(void *data,
{
Evas_Object *entry;
const char *name, *existing_path, *directory;
- char *path;
+ char *path, *text;
directory = _directory_path;
existing_path = (char *) data;
@@ -134,7 +141,9 @@ _edi_file_screens_rename_cb(void *data,
return;
}
- path = edi_path_append(directory, name);
+ text = elm_entry_markup_to_utf8(name);
+
+ path = edi_path_append(directory, text);
if (ecore_file_exists(path))
{
@@ -161,6 +170,7 @@ _edi_file_screens_rename_cb(void *data,
evas_object_del(_popup);
free(path);
+ free(text);
}
void
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index 56bea4b..466dd44 100644
--- a/src/lib/edi_scm.c
+++ b/src/lib/edi_scm.c
@@ -91,7 +91,7 @@ _edi_scm_git_file_add(const char *path)
int code;
Eina_Strbuf *command = eina_strbuf_new();
- eina_strbuf_append_printf(command, "git add '%s'", path);
+ eina_strbuf_append_printf(command, "git add %s", path);
code = _edi_scm_exec(eina_strbuf_string_get(command));
@@ -106,7 +106,7 @@ _edi_scm_git_file_mod(const char *path)
int code;
Eina_Strbuf *command = eina_strbuf_new();
- eina_strbuf_append_printf(command, "git mod '%s'", path);
+ eina_strbuf_append_printf(command, "git mod %s", path);
code = _edi_scm_exec(eina_strbuf_string_get(command));
@@ -136,7 +136
[EGIT] [tools/edi] master 02/02: edi: escape paths
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=8bb8e412d8f74adf0952a66f6889d1dcfff195f4 commit 8bb8e412d8f74adf0952a66f6889d1dcfff195f4 Merge: e86760b c03a712 Author: Al Poole Date: Wed Sep 27 19:43:40 2017 +0100 edi: escape paths TODO | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[EGIT] [tools/edi] edi-0.6 01/01: exe: fix cleanup on FreeBSD of ecore_con_server/clients.
netstar pushed a commit to branch edi-0.6.
http://git.enlightenment.org/tools/edi.git/commit/?id=85594c93a9882a593215b6e23859d01e1275e2e2
commit 85594c93a9882a593215b6e23859d01e1275e2e2
Author: Al Poole
Date: Sun Sep 24 11:30:55 2017 +0100
exe: fix cleanup on FreeBSD of ecore_con_server/clients.
---
src/lib/edi_exe.c | 46 --
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/lib/edi_exe.c b/src/lib/edi_exe.c
index 078a033..72934dd 100644
--- a/src/lib/edi_exe.c
+++ b/src/lib/edi_exe.c
@@ -15,13 +15,11 @@ typedef struct _Edi_Exe_Args {
void ((*func)(int, void *));
void *data;
pid_t pid;
- char *path;
- Ecore_Con_Server *srv;
Ecore_Event_Handler *handler;
} Edi_Exe_Args;
static Eina_Bool
-_edi_exe_notify_data_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
+_edi_exe_notify_client_data_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
{
int *status;
Edi_Exe_Args *args;
@@ -34,18 +32,7 @@ _edi_exe_notify_data_cb(void *data, int type EINA_UNUSED,
void *event EINA_UNUSE
args->func(*status, args->data);
- /* Manually cleaning up??? */
- if (ecore_con_server_fd_get(args->srv) != -1)
- close(ecore_con_server_fd_get(args->srv));
- if (ecore_con_client_fd_get(ev->client) != -1)
- close(ecore_con_client_fd_get(ev->client));
-
- if (args->path)
- {
-if (ecore_file_exists(args->path))
- unlink(args->path);
-free(args->path);
- }
+ ecore_con_client_send(ev->client, status, sizeof(int));
free(args);
@@ -65,14 +52,26 @@ edi_exe_notify_handle(const char *name, void ((*func)(int,
void *)), void *data)
args = malloc(sizeof(Edi_Exe_Args));
args->func = func;
args->data = data;
- args->path = ecore_con_local_path_new(EINA_FALSE, name, 0);
- args->srv = srv;
- args->handler = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
(Ecore_Event_Handler_Cb) _edi_exe_notify_data_cb, args);
+ args->handler = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
(Ecore_Event_Handler_Cb) _edi_exe_notify_client_data_cb, args);
return EINA_TRUE;
}
static Eina_Bool
+_edi_exe_notify_server_data_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
+{
+ Ecore_Con_Event_Server_Data *ev = event;
+ Edi_Exe_Args *args = data;
+
+ ecore_event_handler_del(args->handler);
+ ecore_con_server_del(ev->server);
+
+ free(args);
+
+ return ECORE_CALLBACK_DONE;
+}
+
+static Eina_Bool
_edi_exe_event_done_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
*event)
{
Ecore_Exe_Event_Del *ev;
@@ -90,13 +89,16 @@ _edi_exe_event_done_cb(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event
srv = ecore_con_server_connect(ECORE_CON_LOCAL_USER, name, 0, NULL);
if (srv)
{
+ ecore_event_handler_del(args->handler);
+ args->handler = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_edi_exe_notify_server_data_cb, args);
ecore_con_server_send(srv, &ev->exit_code, sizeof(int));
ecore_con_server_flush(srv);
}
-
- ecore_event_handler_del(args->handler);
-
- free(args);
+ else
+{
+ ecore_event_handler_del(args->handler);
+ free(args);
+}
return ECORE_CALLBACK_DONE;
}
--
[EGIT] [tools/edi] edi-0.6 01/01: filepanel: make dialogues more informative.
netstar pushed a commit to branch edi-0.6.
http://git.enlightenment.org/tools/edi.git/commit/?id=dcac3dc39c1401ebbdc6869a222d838cd4cc2612
commit dcac3dc39c1401ebbdc6869a222d838cd4cc2612
Author: Al Poole
Date: Fri Sep 22 15:07:23 2017 +0100
filepanel: make dialogues more informative.
---
src/bin/edi_filepanel.c | 28 +---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 45442c9..565c5aa 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -336,8 +336,16 @@ static void
_item_menu_del_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- edi_screens_message_confirm(_main_win, _("Are you sure you want to delete
this file?"),
+ Edi_Dir_Data *sd = data;
+ Eina_Strbuf *message = eina_strbuf_new();
+
+ eina_strbuf_append_printf(message, _("Are you sure you want to delete
%s ?"),
+ ecore_file_file_get(sd->path));
+
+ edi_screens_message_confirm(_main_win, eina_strbuf_string_get(message),
_item_menu_del_do_cb, data);
+
+ eina_strbuf_free(message);
}
static void
@@ -374,8 +382,14 @@ static void
_item_menu_scm_del_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- edi_screens_message_confirm(_main_win, _("Are you sure you want to delete
this file?"),
+ Edi_Dir_Data *sd = data;
+ Eina_Strbuf *message = eina_strbuf_new();
+
+ eina_strbuf_append_printf(message, _("Are you sure you want to delete
%s ?"),
+ ecore_file_file_get(sd->path));
+ edi_screens_message_confirm(_main_win, eina_strbuf_string_get(message),
_item_menu_scm_del_do_cb, data);
+ eina_strbuf_free(message);
}
static void
@@ -477,8 +491,16 @@ static void
_item_menu_rmdir_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- edi_screens_message_confirm(_main_win, _("Are you sure you want to delete
this directory?"),
+ Edi_Dir_Data *sd = data;
+ Eina_Strbuf *message = eina_strbuf_new();
+
+ eina_strbuf_append_printf(message, _("Are you sure you want to delete
%s ?"),
+ ecore_file_file_get(sd->path));
+
+ edi_screens_message_confirm(_main_win, eina_strbuf_string_get(message),
_item_menu_rmdir_do_cb, data);
+
+ eina_strbuf_free(message);
}
static void
--
[EGIT] [tools/edi] master 01/01: exe: fix cleanup on FreeBSD of ecore_con_server/clients.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=1419f901307f6e07564499636b450b978f31
commit 1419f901307f6e07564499636b450b978f31
Author: Al Poole
Date: Sun Sep 24 11:30:55 2017 +0100
exe: fix cleanup on FreeBSD of ecore_con_server/clients.
---
src/lib/edi_exe.c | 46 --
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/src/lib/edi_exe.c b/src/lib/edi_exe.c
index 078a033..72934dd 100644
--- a/src/lib/edi_exe.c
+++ b/src/lib/edi_exe.c
@@ -15,13 +15,11 @@ typedef struct _Edi_Exe_Args {
void ((*func)(int, void *));
void *data;
pid_t pid;
- char *path;
- Ecore_Con_Server *srv;
Ecore_Event_Handler *handler;
} Edi_Exe_Args;
static Eina_Bool
-_edi_exe_notify_data_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
+_edi_exe_notify_client_data_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
{
int *status;
Edi_Exe_Args *args;
@@ -34,18 +32,7 @@ _edi_exe_notify_data_cb(void *data, int type EINA_UNUSED,
void *event EINA_UNUSE
args->func(*status, args->data);
- /* Manually cleaning up??? */
- if (ecore_con_server_fd_get(args->srv) != -1)
- close(ecore_con_server_fd_get(args->srv));
- if (ecore_con_client_fd_get(ev->client) != -1)
- close(ecore_con_client_fd_get(ev->client));
-
- if (args->path)
- {
-if (ecore_file_exists(args->path))
- unlink(args->path);
-free(args->path);
- }
+ ecore_con_client_send(ev->client, status, sizeof(int));
free(args);
@@ -65,14 +52,26 @@ edi_exe_notify_handle(const char *name, void ((*func)(int,
void *)), void *data)
args = malloc(sizeof(Edi_Exe_Args));
args->func = func;
args->data = data;
- args->path = ecore_con_local_path_new(EINA_FALSE, name, 0);
- args->srv = srv;
- args->handler = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
(Ecore_Event_Handler_Cb) _edi_exe_notify_data_cb, args);
+ args->handler = ecore_event_handler_add(ECORE_CON_EVENT_CLIENT_DATA,
(Ecore_Event_Handler_Cb) _edi_exe_notify_client_data_cb, args);
return EINA_TRUE;
}
static Eina_Bool
+_edi_exe_notify_server_data_cb(void *data, int type EINA_UNUSED, void *event
EINA_UNUSED)
+{
+ Ecore_Con_Event_Server_Data *ev = event;
+ Edi_Exe_Args *args = data;
+
+ ecore_event_handler_del(args->handler);
+ ecore_con_server_del(ev->server);
+
+ free(args);
+
+ return ECORE_CALLBACK_DONE;
+}
+
+static Eina_Bool
_edi_exe_event_done_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void
*event)
{
Ecore_Exe_Event_Del *ev;
@@ -90,13 +89,16 @@ _edi_exe_event_done_cb(void *data EINA_UNUSED, int type
EINA_UNUSED, void *event
srv = ecore_con_server_connect(ECORE_CON_LOCAL_USER, name, 0, NULL);
if (srv)
{
+ ecore_event_handler_del(args->handler);
+ args->handler = ecore_event_handler_add(ECORE_CON_EVENT_SERVER_DATA,
_edi_exe_notify_server_data_cb, args);
ecore_con_server_send(srv, &ev->exit_code, sizeof(int));
ecore_con_server_flush(srv);
}
-
- ecore_event_handler_del(args->handler);
-
- free(args);
+ else
+{
+ ecore_event_handler_del(args->handler);
+ free(args);
+}
return ECORE_CALLBACK_DONE;
}
--
[EGIT] [tools/edi] edi-0.6 01/01: filepanel: make dir menu behave as file menu does.
netstar pushed a commit to branch edi-0.6.
http://git.enlightenment.org/tools/edi.git/commit/?id=bd1df1e399b85cf541c584232c72c22203ccdb35
commit bd1df1e399b85cf541c584232c72c22203ccdb35
Author: Al Poole
Date: Fri Sep 22 15:17:39 2017 +0100
filepanel: make dir menu behave as file menu does.
---
src/bin/edi_filepanel.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 610603d..45442c9 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -510,10 +510,13 @@ _item_menu_create_dir_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
static void
_item_menu_dir_create(Evas_Object *win, Edi_Dir_Data *sd)
{
+ Elm_Object_Item *menu_it;
+
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, "document-new", _("Create File here"),
_item_menu_create_file_cb, sd);
--
[EGIT] [tools/edi] master 01/01: filepanel: make dir menu behave as file menu does.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=986bae6eb42f387ecd5f85de54e5d9dffe1640f2
commit 986bae6eb42f387ecd5f85de54e5d9dffe1640f2
Author: Al Poole
Date: Fri Sep 22 15:17:39 2017 +0100
filepanel: make dir menu behave as file menu does.
---
src/bin/edi_filepanel.c | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index c97651c..565c5aa 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -532,10 +532,13 @@ _item_menu_create_dir_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
static void
_item_menu_dir_create(Evas_Object *win, Edi_Dir_Data *sd)
{
+ Elm_Object_Item *menu_it;
+
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, "document-new", _("Create File here"),
_item_menu_create_file_cb, sd);
--
[EGIT] [tools/edi] master 01/01: filepanel: make dialogues more informative.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=e4704ed0ba495cce6c546aa8c1fe53e6a8b36974
commit e4704ed0ba495cce6c546aa8c1fe53e6a8b36974
Author: Al Poole
Date: Fri Sep 22 15:07:23 2017 +0100
filepanel: make dialogues more informative.
---
src/bin/edi_filepanel.c | 28 +---
1 file changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/bin/edi_filepanel.c b/src/bin/edi_filepanel.c
index 610603d..c97651c 100644
--- a/src/bin/edi_filepanel.c
+++ b/src/bin/edi_filepanel.c
@@ -336,8 +336,16 @@ static void
_item_menu_del_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- edi_screens_message_confirm(_main_win, _("Are you sure you want to delete
this file?"),
+ Edi_Dir_Data *sd = data;
+ Eina_Strbuf *message = eina_strbuf_new();
+
+ eina_strbuf_append_printf(message, _("Are you sure you want to delete
%s ?"),
+ ecore_file_file_get(sd->path));
+
+ edi_screens_message_confirm(_main_win, eina_strbuf_string_get(message),
_item_menu_del_do_cb, data);
+
+ eina_strbuf_free(message);
}
static void
@@ -374,8 +382,14 @@ static void
_item_menu_scm_del_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- edi_screens_message_confirm(_main_win, _("Are you sure you want to delete
this file?"),
+ Edi_Dir_Data *sd = data;
+ Eina_Strbuf *message = eina_strbuf_new();
+
+ eina_strbuf_append_printf(message, _("Are you sure you want to delete
%s ?"),
+ ecore_file_file_get(sd->path));
+ edi_screens_message_confirm(_main_win, eina_strbuf_string_get(message),
_item_menu_scm_del_do_cb, data);
+ eina_strbuf_free(message);
}
static void
@@ -477,8 +491,16 @@ static void
_item_menu_rmdir_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- edi_screens_message_confirm(_main_win, _("Are you sure you want to delete
this directory?"),
+ Edi_Dir_Data *sd = data;
+ Eina_Strbuf *message = eina_strbuf_new();
+
+ eina_strbuf_append_printf(message, _("Are you sure you want to delete
%s ?"),
+ ecore_file_file_get(sd->path));
+
+ edi_screens_message_confirm(_main_win, eina_strbuf_string_get(message),
_item_menu_rmdir_do_cb, data);
+
+ eina_strbuf_free(message);
}
static void
--
[EGIT] [tools/edi] master 01/01: screens: scm. only show staged changes.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=376d4c5752092ec86f6dd5ca8f82115b288e2121
commit 376d4c5752092ec86f6dd5ca8f82115b288e2121
Author: Al Poole
Date: Thu Sep 21 20:45:33 2017 +0100
screens: scm. only show staged changes.
---
src/bin/screens/edi_scm_screens.c | 13 -
src/lib/edi_scm.c | 11 +++
src/lib/edi_scm.h | 6 --
3 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/src/bin/screens/edi_scm_screens.c
b/src/bin/screens/edi_scm_screens.c
index b14d357..45cc5c0 100644
--- a/src/bin/screens/edi_scm_screens.c
+++ b/src/bin/screens/edi_scm_screens.c
@@ -300,9 +300,12 @@ _file_status_list_fill(Evas_Object *list)
{
EINA_LIST_FREE(e->statuses, status)
{
- _file_status_item_add(status->path, status->change);
- elm_genlist_item_append(list, itc, strdup(status->path), NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
- if (status->staged) staged = EINA_TRUE;
+ if (status->staged)
+ {
+ staged = EINA_TRUE;
+ _file_status_item_add(status->path, status->change);
+ elm_genlist_item_append(list, itc, strdup(status->path),
NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ }
eina_stringshare_del(status->fullpath);
eina_stringshare_del(status->path);
@@ -452,13 +455,13 @@ edi_scm_screens_commit(Evas_Object *parent)
elm_box_pack_end(box, frame);
// End of Trick
- text = edi_scm_diff();
+ text = edi_scm_diff(EINA_TRUE);
if (text[0] && text[1])
{
frame = elm_frame_add(popup);
evas_object_size_hint_weight_set(frame, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(frame, EVAS_HINT_FILL, EVAS_HINT_FILL);
-elm_object_text_set(frame, _("Unstaged changes"));
+elm_object_text_set(frame, _("Committed changes"));
evas_object_show(frame);
cbox = elm_box_add(popup);
diff --git a/src/lib/edi_scm.c b/src/lib/edi_scm.c
index 7f86cb0..56bea4b 100644
--- a/src/lib/edi_scm.c
+++ b/src/lib/edi_scm.c
@@ -317,14 +317,17 @@ _edi_scm_git_status_get(void)
}
static char *
-_edi_scm_git_diff(void)
+_edi_scm_git_diff(Eina_Bool cached)
{
char *output;
Eina_Strbuf *command;
command = eina_strbuf_new();
- eina_strbuf_append(command, "git diff");
+ if (cached)
+ eina_strbuf_append(command, "git diff --cached");
+ else
+ eina_strbuf_append(command, "git diff");
output = _edi_scm_exec_response(eina_strbuf_string_get(command));
@@ -608,11 +611,11 @@ edi_scm_remote_add(const char *remote_url)
}
EAPI char *
-edi_scm_diff(void)
+edi_scm_diff(Eina_Bool cached)
{
Edi_Scm_Engine *e = edi_scm_engine_get();
- return e->diff();
+ return e->diff(cached);
}
EAPI void
diff --git a/src/lib/edi_scm.h b/src/lib/edi_scm.h
index a405cfb..480b762 100644
--- a/src/lib/edi_scm.h
+++ b/src/lib/edi_scm.h
@@ -38,7 +38,7 @@ typedef int (scm_fn_del)(const char *path);
typedef int (scm_fn_move)(const char *src, const char *dest);
typedef int (scm_fn_commit)(const char *message);
typedef int (scm_fn_status)(void);
-typedef char *(scm_fn_diff)(void);
+typedef char *(scm_fn_diff)(Eina_Bool);
typedef int (scm_fn_push)(void);
typedef int (scm_fn_pull)(void);
typedef int (scm_fn_stash)(void);
@@ -188,9 +188,11 @@ Eina_Bool edi_scm_status_get(void);
/**
* Get diff of changes in repository.
*
+ * @param cached Whether the results are general or cached changes.
+ *
* @return diff output as a string.
*/
-char *edi_scm_diff(void);
+char *edi_scm_diff(Eina_Bool cached);
/**
* Move from src to dest.
--
[EGIT] [tools/edi] master 01/01: scm: use relative path not absolute.
netstar pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=d8e0087b6fb06fddf5ff88217cddb5e29155d2ba
commit d8e0087b6fb06fddf5ff88217cddb5e29155d2ba
Author: Al Poole
Date: Thu Sep 21 20:26:13 2017 +0100
scm: use relative path not absolute.
This is also faster.
---
src/bin/screens/edi_scm_screens.c | 16 +++-
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/bin/screens/edi_scm_screens.c
b/src/bin/screens/edi_scm_screens.c
index e366f51..b14d357 100644
--- a/src/bin/screens/edi_scm_screens.c
+++ b/src/bin/screens/edi_scm_screens.c
@@ -181,22 +181,21 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
{
Evas_Object *box, *lbox, *mbox, *rbox, *label, *ic;
Edi_Scm_Status_Code *code;
- char *text, *path;
- const char *icon_name, *icon_status;
+ const char *text, *icon_name, *icon_status;
+ char *path;
Eina_Bool staged = EINA_FALSE;
if (strcmp(source, "elm.swallow.content"))
return NULL;
path = (char *) data;
- text = NULL; icon_name = icon_status = NULL;
+
+ icon_name = icon_status = NULL;
code = _file_status_item_find(path);
if (code)
icon_status = _icon_status(*code, &staged);
- text = strdup(basename((char *)path));
-
icon_name = "dialog-information";
box = elm_box_add(obj);
@@ -215,8 +214,7 @@ _content_get(void *data, Evas_Object *obj, const char
*source)
elm_box_pack_end(lbox, ic);
label = elm_label_add(lbox);
- elm_object_text_set(label, text);
- free(text);
+ elm_object_text_set(label, path);
evas_object_show(label);
elm_box_pack_end(lbox, label);
@@ -302,8 +300,8 @@ _file_status_list_fill(Evas_Object *list)
{
EINA_LIST_FREE(e->statuses, status)
{
- _file_status_item_add(status->fullpath, status->change);
- elm_genlist_item_append(list, itc, strdup(status->fullpath),
NULL, ELM_GENLIST_ITEM_NONE, NULL, NULL);
+ _file_status_item_add(status->path, status->change);
+ elm_genlist_item_append(list, itc, strdup(status->path), NULL,
ELM_GENLIST_ITEM_NONE, NULL, NULL);
if (status->staged) staged = EINA_TRUE;
eina_stringshare_del(status->fullpath);
--
[EGIT] [tools/edi] master 01/01: screens: scm, remove unnecessary hash clear.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=4edd09cc592fcc5708165cfce019127a1725221a commit 4edd09cc592fcc5708165cfce019127a1725221a Author: Al Poole Date: Thu Sep 21 20:09:48 2017 +0100 screens: scm, remove unnecessary hash clear. Small stylistic change also. --- src/bin/screens/edi_scm_screens.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/screens/edi_scm_screens.c b/src/bin/screens/edi_scm_screens.c index b48311c..e366f51 100644 --- a/src/bin/screens/edi_scm_screens.c +++ b/src/bin/screens/edi_scm_screens.c @@ -290,7 +290,6 @@ _file_status_list_fill(Evas_Object *list) } _hash_statuses = eina_hash_string_superfast_new(_list_status_free_cb); - eina_hash_free_buckets(_hash_statuses); itc = elm_genlist_item_class_new(); itc->item_style = "full"; @@ -502,11 +501,12 @@ edi_scm_screens_commit(Evas_Object *parent) elm_object_part_content_set(popup, "button2", button); evas_object_smart_callback_add(button, "clicked", _edi_scm_screens_commit_cb, input); - evas_object_show(popup); if (staged_changes) elm_entry_select_all(input); elm_object_focus_set(input, EINA_TRUE); + + evas_object_show(popup); } void --
[EGIT] [tools/edi] master 01/01: scm screens: select text when staged changes made.
netstar pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=89dfc351bf1c1435edcbb4be3e67f9f96394fda3 commit 89dfc351bf1c1435edcbb4be3e67f9f96394fda3 Author: Al Poole Date: Thu Sep 21 14:51:54 2017 +0100 scm screens: select text when staged changes made. Another aspect of making the entry more user-friendly. --- src/bin/screens/edi_scm_screens.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/bin/screens/edi_scm_screens.c b/src/bin/screens/edi_scm_screens.c index bf7fc33..b48311c 100644 --- a/src/bin/screens/edi_scm_screens.c +++ b/src/bin/screens/edi_scm_screens.c @@ -503,6 +503,9 @@ edi_scm_screens_commit(Evas_Object *parent) evas_object_smart_callback_add(button, "clicked", _edi_scm_screens_commit_cb, input); evas_object_show(popup); + if (staged_changes) + elm_entry_select_all(input); + elm_object_focus_set(input, EINA_TRUE); } --
