Re: Viewrendered3 Read For Beta Testing

[Thomas Passin]

My clone of the Leo repository already has a devel branch that I had just 
updated.  Github Desktop seemed confused when I went to merge my private 
VR3 into my private devel, so I just copied the modified files into devel 
instead.  Could that have caused what you see?  The actual changes to 
qt_gui were in only two places, to add viewrendered3 to the list of 
viewrenderedxx that would be used for displaying plugin docstrings, 
help-for-command, etc.

Can I just clone a branch of the Leo repo?  I thought - at least, using 
Github Desktop - that I could only get the whole repo with all its branches.

On Wednesday, March 11, 2020 at 11:44:06 AM UTC-4, Edward K. Ream wrote:
>
>
>
> On Wed, Mar 11, 2020 at 8:33 AM Thomas Passin  > wrote:
>
>> I updated devel on my repo a few minutes ago to be level with Leo's 
>> devel, and merged VR3 into it.  Then I made a new pull request.  I hope 
>> that's what you need.  Otherwise I'll need a bit of handholding...
>>
>
> Something's not right. There is a large diff against qt_gui.py.
>
> I suggest making a new private branch off of devel, then making the 
> minimal changes needed to get VR3 to work.
>
> Edward
>

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/e928cc64-a0d0-48a7-abb5-b7be250b001b%40googlegroups.com.

Re: Viewrendered3 Read For Beta Testing

[Edward K. Ream]

On Wed, Mar 11, 2020 at 8:33 AM Thomas Passin  wrote:

> I updated devel on my repo a few minutes ago to be level with Leo's devel,
> and merged VR3 into it.  Then I made a new pull request.  I hope that's
> what you need.  Otherwise I'll need a bit of handholding...
>

Something's not right. There is a large diff against qt_gui.py.

I suggest making a new private branch off of devel, then making the minimal
changes needed to get VR3 to work.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/CAMF8tS1qRLbUKsLbAESNg6rS6FGq%2B9dR5n9i0NRTGg%2BKKcWhVQ%40mail.gmail.com.

Re: Viewrendered3 Read For Beta Testing

[Thomas Passin]

I updated devel on my repo a few minutes ago to be level with Leo's devel, 
and merged VR3 into it.  Then I made a new pull request.  I hope that's 
what you need.  Otherwise I'll need a bit of handholding...

On Wednesday, March 11, 2020 at 5:36:17 AM UTC-4, Edward K. Ream wrote:
>
> On Tue, Mar 10, 2020 at 12:30 PM Thomas Passin  > wrote:
>
>> I have submitted a pull request for the Vewrendered3 plugin.  
>>
>
> Please resubmit this PR with it based on devel, not master.
>
> Edward
>

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/69cce51a-8a38-4938-a79f-2485a74083e6%40googlegroups.com.

6.2 branch created. devel is open

[Edward K. Ream]

Matt and I will work in the 6.2 branch, making last-minute bug fixes, 
updating docs and distro files.

I'll merge 6.2 into devel periodically, but never the other way around.

In short, devel is now open. It's status won't affect the 6.2 branch.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/ea756d09-b296-48fe-b6bf-cd31aee55fce%40googlegroups.com.

Re: Please hold commits to devel until the 6.2 branch exists

[Edward K. Ream]

On Wed, Mar 11, 2020 at 5:43 AM Edward K. Ream  wrote:

1. The code base isn't complete now, so creating a 6.2 branch would be
> premature. It would imply merging devel into 6.2, or cherry-picking code
> from devel.
>

Actually not. I could fix any last-minute bugs in the 6.2 branch, then
merge the branch into devel.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/CAMF8tS3h6zWyqG46vZ31-2d8Q2Jt%3Dx30ou%3DGJ%2BubsX-uF8UXfQ%40mail.gmail.com.

Re: The dock2 branch is ready for testing

[Edward K. Ream]

On Tuesday, March 10, 2020 at 5:12:30 AM UTC-5, Edward K. Ream wrote:
>
> On Monday, March 9, 2020 at 3:51:37 PM UTC-5, Chris George wrote:
>
> >After a couple hours of monkeying I will stick with Alt-w etc. manually 
> at start.
>
> There may be a way of getting what you want without impacting startup and 
> caching. 
>

There is a serious bug with multiple body docks. Clicking in the main 
(leftmost) body dock doesn't fully select it. You could call this a release 
blocker.

For example, an Alt-Up will select select the *other* body dock.  I'll fix 
this as part of #1527. Fixing this bug will likely cause the title of the 
main body dock to track c.p.h.

I'll do the work in the dock2 branch, which is still around even though it 
has been merged into devel.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/a5df25f1-10c7-4a5e-8726-4fa75a53fb23%40googlegroups.com.

Please hold commits to devel until the 6.2 branch exists

[Edward K. Ream]

Matt, this does not apply to you.

This is a side effect of the new release plan:

1. The code base isn't complete now, so creating a 6.2 branch would be 
premature. It would imply merging devel into 6.2, or cherry-picking code 
from devel.

2. We don't want last-minute code to become part of 6.2, except for code 
that I personally approve.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/a2cd2580-13a4-41a5-9260-3e6fad261928%40googlegroups.com.

Switching between --global-docks and --use-docks causes problems

[Edward K. Ream]

When switching between using the --global-docks and --use-docks 
command-line options, Qt gets confused about layouts. The easiest solution 
is to clear .leo/db.

I doubt that this can be fixed. Most of the relevant code is Qt magic.

This is a minor glitch. Most Leonistas will use one or the the other 
command-line option exclusively.

I have just created #1529 
 to memorialize this 
buglet.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/36422b43-a780-48f6-bea4-9d7b6ce9abfe%40googlegroups.com.

The cache and dock2 branches have been merged into devel

[Edward K. Ream]

These branches fix #1484 
 and #1527 
, respectively.

I plan a bit more work on the dock2 branch, so Leo 6.2 isn't quite code 
complete.

Please test devel now and report any problems.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/859121f1-f6f8-4466-b00a-6bbc3c304fa4%40googlegroups.com.

About the upcoming 6.2 branch

[Edward K. Ream]

I'd like to try a new model for releases. The following work flow should 
allow us all to continue using devel while releasing Leo 6.2.

*The plan*

1. When Leo 6.2 is code complete I'll create a new 6.2 branch, based on 
devel.

Leo 6.2 b1 and 6.2 final will be based on the 6.2 branch, *not* devel.

2. *devel should never be merged into the 6.2 branch*.

Instead, I'll merge 6.2 branch into devel one or more times, depending on 
what changes are made to the 6.2 branch.

I'll update the version numbers in devel *once*, after releasing Leo 6.2 
final.

*Details*

- All release work should be done in the 6.2 branch.
- Matt and I should be the only ones working in this branch. 
- Any last-minute code changes should be made to the 6.2 branch, *not* 
devel.
- I'll document Leo 6.2 in devel *before* creating the 6.2 branch.
  After creating the 6.2 branch, any changes to the docs should be made in 
the 6.2 branch.

*Summary*

It will be several days before I create the 6.2 branch, so there is plenty 
of time to tweak this plan based on your comments.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/e6a09ca8-a627-4f22-a844-39c6d3829336%40googlegroups.com.

Re: Viewrendered3 Read For Beta Testing

[Edward K. Ream]

On Tue, Mar 10, 2020 at 12:30 PM Thomas Passin  wrote:

> I have submitted a pull request for the Vewrendered3 plugin.
>

Please resubmit this PR with it based on devel, not master.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/CAMF8tS2SQiR4W-rvectFr4P5yiTsC6XNvRaPRLM%2BKKxPLwY9XQ%40mail.gmail.com.

Re: Importer for todo.txt files is ready for testing

[Edward K. Ream]

On Wed, Mar 11, 2020 at 1:07 AM Xu Wang  wrote:

great. Thanks Edward. I will test this feature in the coming weekend.
>

You're welcome.

Edward

-- 
You received this message because you are subscribed to the Google Groups 
"leo-editor" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to leo-editor+unsubscr...@googlegroups.com.
To view this discussion on the web visit 
https://groups.google.com/d/msgid/leo-editor/CAMF8tS2iA-ZHciyZDKRV-eV3Zkkj6HGJurikHTuiTYw8g%2BDycA%40mail.gmail.com.