Re: [GNC-dev] Bug796872 Multiple selection feature in import matcher
Thanks John, I took the fresh fork route. There should be a pull request for the files for the Multiple selection waiting for you. I'll go through the commands though to mprove my education. David - David Cousens -- Sent from: http://gnucash.1415818.n4.nabble.com/GnuCash-Dev-f1435356.html ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: [GNC-dev] Bug796872 Multiple selection feature in import matcher
> On Apr 25, 2019, at 11:24 PM, David Cousens wrote: > > And the wrong bug report again again. I think the original was possibly > closed before moving from the original bugzilla.org version. My only excuse > is I was getting over a trip to Singapore and an overnight flight back > yesterday. > > For some reason the changes in the commits > https://github.com/Gnucash/gnucash/commit/01339a782c91a8d931cc9d7462ddce19afc60635 > and > https://github.com/Gnucash/gnucash/commit/cae8ecde8f9ddd615ff47c783ce8136395bd71a9 > don't seem to have made it into v 3.3 on or if they did they didn't have the > correct files. Due to my inexperience with git and github at the time you > had to fix up a pull request from my github repository so that may have > caused the problem. > > To get the multiple selection to work for myself, I have been patching 3.2, > 3.3, 3.4 and 3.5 after downloading the sources before building. The version > of import-main-matcher.c and dialog-import.glade which were in 3.2, 3.3,3.4 > and 3.5 didn't contain the changes (file size of import-main-matcher.c in > the gnucash-3..tar.bz2 in each case was 37.2kB for 3.5, 37.2kB for 3.4, > 35.2kB for 3.3, 35.2kB for 3.2 for example, and my modified version of that > file wass 43.8kB. I had the original source archives I downloaded for each > version and have just freshly unpacked them to check that the code changes > are not in the files.) I rebuilt 3.5 today with the modified files after > adding in another patch to replace gtk_menu_popup with > gtk_menu_popup_at_pointer to eliminate a warning coming up about deprecation > of gtk_menu_popup and it is all working OK. > > I am inclined to clear out my github repository and my local repository copy > on my computer and refork from GnuCash/gnucash to remove any consequences of > my previous inexperience using git and github. I have and will retain > separate copies of the altered files of course. If I then create a new > feature branch off the maint branch and copy the altered files into that, > push it to my repository and then create a new pull request, you should then > get the right files which should fix things for the next release. If anyone > wants to incorporate it before then I can send them copies of the patched > files. David, A clean start seems like a good idea. There's no need to re-fork. Just do git fetch from the GnuCash repo, reset your local branches to those, and force-push to your personal GitHub repo. Suppose that you've called the GnuCash remote "origin" and your personal one "github": git fetch origin git checkout master git reset --hard origin/master git push -f github master git checkout maint git reset --hard origin/maint git push -f github maint That will discard everything you've done, so you might want to first git checkout -b my_master master git checkout -b my_maint maint before resetting master and maint. Then you can look at the diffs between e.g. my_maint and maint to see what if anything hasn't been committed upstream. Regards John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: [GNC-dev] Bug796872 Multiple selection feature in import matcher
And the wrong bug report again again. I think the original was possibly closed before moving from the original bugzilla.org version. My only excuse is I was getting over a trip to Singapore and an overnight flight back yesterday. For some reason the changes in the commits https://github.com/Gnucash/gnucash/commit/01339a782c91a8d931cc9d7462ddce19afc60635 and https://github.com/Gnucash/gnucash/commit/cae8ecde8f9ddd615ff47c783ce8136395bd71a9 don't seem to have made it into v 3.3 on or if they did they didn't have the correct files. Due to my inexperience with git and github at the time you had to fix up a pull request from my github repository so that may have caused the problem. To get the multiple selection to work for myself, I have been patching 3.2, 3.3, 3.4 and 3.5 after downloading the sources before building. The version of import-main-matcher.c and dialog-import.glade which were in 3.2, 3.3,3.4 and 3.5 didn't contain the changes (file size of import-main-matcher.c in the gnucash-3..tar.bz2 in each case was 37.2kB for 3.5, 37.2kB for 3.4, 35.2kB for 3.3, 35.2kB for 3.2 for example, and my modified version of that file wass 43.8kB. I had the original source archives I downloaded for each version and have just freshly unpacked them to check that the code changes are not in the files.) I rebuilt 3.5 today with the modified files after adding in another patch to replace gtk_menu_popup with gtk_menu_popup_at_pointer to eliminate a warning coming up about deprecation of gtk_menu_popup and it is all working OK. I am inclined to clear out my github repository and my local repository copy on my computer and refork from GnuCash/gnucash to remove any consequences of my previous inexperience using git and github. I have and will retain separate copies of the altered files of course. If I then create a new feature branch off the maint branch and copy the altered files into that, push it to my repository and then create a new pull request, you should then get the right files which should fix things for the next release. If anyone wants to incorporate it before then I can send them copies of the patched files. David - David Cousens -- Sent from: http://gnucash.1415818.n4.nabble.com/GnuCash-Dev-f1435356.html ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: [GNC-dev] Bug796872 Multiple selection feature in import matcher
Sorry John, I had the wrong bug number it should have been 796874 for the multiple selection mods. I have replaced a call to gtk_menu_popup with gtk_menu_popup_at_pointer in import-main-matcher.c but have yet to test it out. Looks like it will be a straightforward dropin for the deprecated call which popped a menu up at the pointer. David - David Cousens -- Sent from: http://gnucash.1415818.n4.nabble.com/GnuCash-Dev-f1435356.html ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
Re: [GNC-dev] Bug796872 Multiple selection feature in import matcher
> On Apr 25, 2019, at 3:52 PM, David Cousens wrote: > > Hi John, > > I noticed from Jeff Albrecht's post in the User forum yesterday that the > mods to the import-main-matcher to implement assignment of a transfer > account to multiple transaction(-feature request Bug 796872) didn't make it > into v3.5 although the corresponding documentation changes are now in the > current document set. I originally made those changes in the master branch > rather than the maint branch as it was a new feature. Would it have been > better to put it into the maint branch and is it it possible to shift it > from master to maint so it goes in for 3.6? I copied the 2 files changed > into a 3.5 downloaded source and it still builds and works fine but it is > throwing a warning about deprecation of gtk_menu_popup() during compilation. > I will fix that. David, Quoting from https://bugs.gnucash.org/show_bug.cgi?id=796872: > John Ralls 2018-10-05 17:12:24 EDT > David, > > You wrote on the developer's list: > "My apologies V3,1 ,V3.2 and V3.3 are behaving as expected and as they should > with OFX importing and are correctly importing the data file in all three > versions." > > Doesn't that mean that this can be closed along with PR 419? > > David Cousens DaveC49 2018-10-05 22:14:45 EDT > Yes John, > > I managed to confuse myself totally as to which version I had running. Both > casn be closed. > > David After which I closed it and https://github.com/Gnucash/gnucash/pull/419. Seems there's still some confusion... Regards, John Ralls ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel
[GNC-dev] Bug796872 Multiple selection feature in import matcher
Hi John, I noticed from Jeff Albrecht's post in the User forum yesterday that the mods to the import-main-matcher to implement assignment of a transfer account to multiple transaction(-feature request Bug 796872) didn't make it into v3.5 although the corresponding documentation changes are now in the current document set. I originally made those changes in the master branch rather than the maint branch as it was a new feature. Would it have been better to put it into the maint branch and is it it possible to shift it from master to maint so it goes in for 3.6? I copied the 2 files changed into a 3.5 downloaded source and it still builds and works fine but it is throwing a warning about deprecation of gtk_menu_popup() during compilation. I will fix that. David - David Cousens -- Sent from: http://gnucash.1415818.n4.nabble.com/GnuCash-Dev-f1435356.html ___ gnucash-devel mailing list gnucash-devel@gnucash.org https://lists.gnucash.org/mailman/listinfo/gnucash-devel