From: Chris C. <ca...@al...> - 2010-09-28 11:07:12
|
Just looking over the list of branches in SVN -- I was thinking of making a new one for "Win32-MinGW fixes" and thought I'd review what was already there. Can anyone help out with determining which of these branches are still relevant and which are redundant? Any branch that has been merged into trunk, superseded by a more recent branch, definitively determined to be a total waste of time, or never committed to meaningfully at all might be considered to be redundant and get shunted out into the obsolete directory. Anything else should probably still be considered relevant -- even if the work in it is hopelessly out of date, very incomplete, or heading in the wrong direction, if there's any chance that we might want to refer to it again then it might as well stay. Here's my first cut. Please fill in the unknowns... ALREADY BEEN MERGED? branches/devicepush/ r10766 | cannam | 2009-08-26 16:10:39 +0100 (Wed, 26 Aug 2009) | 3 lines * Tidy up branches/kiftsgate/ r9069 | cannam | 2008-09-01 12:59:22 +0100 (Mon, 01 Sep 2008) | 3 lines * Merge from trunk branches/newcontrolrulers/ r10446 | cjnfryer | 2009-06-28 21:34:49 +0100 (Sun, 28 Jun 2009) | 4 lines Minor improvements. A little bit more cleaning and tidying. Getting ready to merge back to trunk. branches/noteitem/ r11692 | cannam | 2010-01-22 15:43:18 +0000 (Fri, 22 Jan 2010) | 3 lines * Add tiny versions of notes for panner (just a block & line) branches/project_packager_rewrite/ r10874 | dmmcintyr | 2009-09-12 20:13:48 +0100 (Sat, 12 Sep 2009) | 2 lines ... branches/threads/ r9226 | cannam | 2008-09-12 12:52:26 +0100 (Fri, 12 Sep 2008) | 3 lines * some tidying REDUNDANT? branches/glasgow_pitchtracker/ r7209 | plcl | 2006-04-17 14:33:24 +0100 (Mon, 17 Apr 2006) | 1 line Fix binary files and properties branches/glasgow_pitchtracker_update/ r8076 | cannam | 2007-06-25 15:48:15 +0100 (Mon, 25 Jun 2007) | 3 lines * add moc file includes branches/stable_10_02/ r11822 | dmmcintyr | 2010-02-18 00:19:03 +0000 (Thu, 18 Feb 2010) | 8 lines Fix the broken menu bug by faking out the disabled progress dialogs using QObject instead of QWidget. (An invisible phantom widget was grabbing the focus. My fault for not properly testing a last minute hack.) Update version to 10.02.1 Bring in Russian translation from 10.04/trunk branches/stg_2.0_1.6/ r8510 | cannam | 2007-12-21 13:08:03 +0000 (Fri, 21 Dec 2007) | 3 lines * Update from stable branch ACTIVE? branches/glasgow-pitchtracker-2009/ r12014 | gperciva | 2010-08-04 05:37:22 +0100 (Wed, 04 Aug 2010) | 2 lines Merge 11980:12013 from master. branches/repeats_and_segment_links/ r12044 | yguillemot | 2010-09-08 21:09:48 +0100 (Wed, 08 Sep 2010) | 5 lines Add the segment observer part of the segment symlink. (The update of the link from the segment is still far to work correctly.) branches/shortcut-editor/ r11983 | alteholz | 2010-06-27 13:21:43 +0100 (Sun, 27 Jun 2010) | 1 line sync merge from trunk branches/stable_10_04/ r11871 | dmmcintyr | 2010-04-23 00:55:44 +0100 (Fri, 23 Apr 2010) | 2 lines Stable fork in case there's a 10.04.1 OLD, BUT COULD BE USEFUL FOR REFERENCE? branches/musicxml/ r8645 | raboofje | 2008-02-12 19:38:22 +0000 (Tue, 12 Feb 2008) | 1 line only increase the end-marker, never decrease. branches/stable_1_7/ r10772 | cannam | 2009-08-27 12:24:15 +0100 (Thu, 27 Aug 2009) | 5 lines * Fix to the superficial problem reported at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=492871 (thanks Arnout) -- though presumably something is still wrong there if shutdown() is being called from createDriver() at all branches/tablature_patch/ r8132 | donalies | 2007-07-27 12:42:21 +0100 (Fri, 27 Jul 2007) | 2 lines A few commands that I had forgotten. DON'T KNOW -- PLEASE ADVISE! branches/ccherrett/ r10232 | ccherrett | 2009-04-22 15:02:22 +0100 (Wed, 22 Apr 2009) | 2 lines added missing events branches/controltransition/ r10979 | cjnfryer | 2009-09-28 20:58:31 +0100 (Mon, 28 Sep 2009) | 2 lines Branch to work on smooth control event transitions branches/double-dots/ r10716 | dmmcintyr | 2009-08-19 15:12:00 +0100 (Wed, 19 Aug 2009) | 4 lines Let's abandon all the extra double dots layers, because I'm just in no mood to puzzle all of that out. I'll start with a new branch and narrower goals, leaving this one from which to rescue the new icons should they ever be needed. branches/experiments-g.l./ r10139 | dmmcintyr | 2009-04-02 22:08:46 +0100 (Thu, 02 Apr 2009) | 1 line Move Guillaume's experiments to a branch branches/no_more_qt3/ r11698 | dmmcintyr | 2010-01-23 06:29:34 +0000 (Sat, 23 Jan 2010) | 2 lines A little random work on this. It's getting hairy now. branches/phil_tmp/ r8888 | phisto_3h | 2008-05-18 21:29:27 +0100 (Sun, 18 May 2008) | 1 line Tentative (not working) patch for audio segments branches/tutorials-site/ r9478 | dmmcintyr | 2008-10-09 02:24:40 +0100 (Thu, 09 Oct 2008) | 2 lines ... Chris |
From: Julie S <msj...@ya...> - 2010-09-28 14:34:10
|
Hello Chris, I do not see any branches in there that I personally am involved in. Sorry, this doesn't help much. But at least you know I look at it. Sincerely, Julie S. |
From: D. M. M. <mic...@ro...> - 2010-09-28 14:39:57
|
On Tuesday, September 28, 2010, Chris Cannam wrote: > ALREADY BEEN MERGED? > branches/devicepush/ > branches/kiftsgate/ > branches/newcontrolrulers/ > branches/noteitem/ > branches/project_packager_rewrite/ > branches/threads/ Yeah, I think so. > REDUNDANT? > branches/glasgow_pitchtracker/ > branches/glasgow_pitchtracker_update/ Probably both redundant, but ask Graham Percival. > branches/stable_10_02/ > branches/stg_2.0_1.6/ Obsolete. > branches/glasgow-pitchtracker-2009/ I think that's the one he's aiming to merge into trunk/ eventually. > branches/repeats_and_segment_links/ Definitely active. > branches/shortcut-editor/ Did this ever go anywhere? I don't remember. > branches/stable_10_04/ We've fallen so far off the horse on the release schedule we may as well dump that and begin anew. > branches/musicxml/ No clue. > branches/stable_1_7/ No point in keeping this around, I don't think. > branches/tablature_patch/ Just dump it in a dusty corner somewhere out of the way. It's extremely ancient and abandoned. > branches/ccherrett/ > branches/controltransition/ > branches/double-dots/ > branches/experiments-g.l./ > branches/phil_tmp/ > branches/tutorials-site/ All obsolete and/or abandoned as far as I know. > branches/no_more_qt3/ I don't know about this one. I invested quite a lot of work on this, but it's probably so old it won't merge without a big fight, and when we merge it, we have a long slog ahead. There were thousands of compiler errors removing Qt 3 compatibility, and after tackling all the obvious quick switch stuff, there were a lot of hairy tangles where things needed quite dramatic rewrites. Given our current level of momentum, it's probably reasonable to pray that Qt maintains the Qt 3 compatibility layer indefinitely, and avoid dealing with this until it's absolutely unavoidable. In any case, it will probably be reasonable just to start from scratch at that time. -- D. Michael McIntyre |
From: Julie S <msj...@ya...> - 2010-09-28 15:36:34
|
Hello All, Michael wrote concerning: > > branches/stable_1_7/ > > No point in keeping this around, I don't think. Well, I don't see a reason to dump it either. I still run RG Classic on my machine as an oracle of sorts. If I can't recall something, I fire up 1.7.x and see what it does...yes, it is still running on this machine. And my build comes from branches/stable_1_7 So I vote we keep that one. Micheal wrote concerning: > > branches/shortcut-editor/ > > Did this ever go anywhere? I don't remember. It made some progress, but I have not seen and development there in a while. Let it hang around for a while longer is my vote. Sincerely, Julie S. |
From: Chris C. <ca...@al...> - 2010-09-28 15:44:46
|
On Tue, Sep 28, 2010 at 4:36 PM, Julie S <msj...@ya...> wrote: > Let it hang around for a while longer is my vote. Yeah, I'm not really thinking of "abandoned by original developer" as enough of a reason to get rid of a branch (even though by "get rid of" I basically just mean to move to branches/obsolete/). "Contains nothing we might ever want to look at again" is a reason to get rid of a branch; "abandoned by original developer" is just a reason to review a branch and see whether it contains anything we might ever want to look at again. Of course, I'm probably more conservative in that regard than many. Chris |
From: D. M. M. <mic...@ro...> - 2010-09-28 19:34:39
|
On Tuesday, September 28, 2010, Chris Cannam wrote: > Yeah, I'm not really thinking of "abandoned by original developer" as > enough of a reason to get rid of a branch (even though by "get rid of" > I basically just mean to move to branches/obsolete/). Unless it was abandoned yeeeeeaaaars ago, like the guitar tablature thing. -- D. Michael McIntyre |
From: Graham P. <g.p...@el...> - 2010-09-28 15:59:54
|
On Tue, Sep 28, 2010 at 10:39:43AM -0400, D. Michael McIntyre wrote: > On Tuesday, September 28, 2010, Chris Cannam wrote: > > > REDUNDANT? > > > branches/glasgow_pitchtracker/ > > branches/glasgow_pitchtracker_update/ > > Probably both redundant, but ask Graham Percival. As far as I'm concerned they are, but I should check with Nick Bailey. > > branches/glasgow-pitchtracker-2009/ > > I think that's the one he's aiming to merge into trunk/ eventually. Yes. It needs about 6 hours of work until it's mergeable. Cheers, - Graham |
From: Thorsten A. <ros...@al...> - 2010-09-28 18:15:24
|
On Tue, 28 Sep 2010, D. Michael McIntyre wrote: >> branches/shortcut-editor/ > > Did this ever go anywhere? I don't remember. It is almost working. The main problem, that I couldn't solve yet, is an ugly background color in selected cells, which make the text unreadable. Maybe somebody else with more qt knowledge might have a look? Thorsten |
From: Julie S <msj...@ya...> - 2010-10-08 19:42:36
|
Hello Thorsten, You wrote: > It is almost working. The main problem, that I couldn't > solve yet, is an > ugly background color in selected cells, which make the > text unreadable. > Maybe somebody else with more qt knowledge might have a > look? I've attached a screen shot (I hope it goes through). I'm not seeing the back background on my system I see some functional things that still need some work, but it has come a long way from when I first saw the editor. Is there something specific I can help with? Or can you point more specifically to the black background problem you are seeing. Sincerely, Julie S. |
From: Julie S <msj...@ya...> - 2010-10-08 19:48:58
|
Hello Thorsten, I see the black when I open the shortcut editor in the Matrix, Event List, and Notation Editors...but not the RG main window.... I imagine there are style inherited from the parent that must be creating this affect. Michael, knows this the styles pretty deeply. I know our style sheet is not the cleanest it could be because we did ported an existing app and had to hack the style sheet in while the code was broken. I'll investigate this a bit this weekend and see what comes up, though. I really don't know how stylesheets work though....but I'll take the dive. Sincerely, Julie S. |
From: D. M. M. <mic...@ro...> - 2010-10-08 20:33:30
|
On Friday, October 08, 2010, Julie S wrote: > to hack the style sheet in while the code was broken. It's not because the code was broken, it's because of the way style is inherited from parents. Things on the deepest layers of inheritance are very difficult to target accurately from the top. Now that you mention it, the file dialog style is also screwed up. I'll see if I can take a look at this today. I need a distraction from not being able to do anything else until Monday. I have a job on the hook, and I'm trying to reel it in. -- D. Michael McIntyre |
From: Thorsten A. <ros...@al...> - 2010-10-10 19:30:15
|
Hi Julie, On Fri, 8 Oct 2010, Julie S wrote: > I see the black when I open the shortcut editor in the Matrix, Event List, > and Notation Editors...but not the RG main window.... yes, sorry that I didn't mention that ... Can you be a bit more specific about the points that need some additional work? Thorsten |
From: D. M. M. <mic...@ro...> - 2010-10-10 21:39:17
|
On Sunday, October 10, 2010, Thorsten Alteholz wrote: > > I see the black when I open the shortcut editor in the Matrix, Event > > List, and Notation Editors...but not the RG main window.... > > yes, sorry that I didn't mention that ... Oh. Makes sense. This inheritance stuff is a bitch that way with stuff that's duplicated in the editors residing on a different layer of the hierarchy, with different intermediate parents. I'll take a quick look. -- D. Michael McIntyre |
From: D. M. M. <mic...@ro...> - 2010-10-10 21:59:36
|
On Sunday, October 10, 2010, D. Michael McIntyre wrote: > I'll take a quick look. It's going to need more surgery than I have time to do, but I see why it's screwing up and know just how to fix it. I wish I could promise some kind of timeframe, but I just don't have the mental energy for this right now, even though I have the time. -- D. Michael McIntyre |