<html>
<head>
<style>
.hmmessage P
{
margin:0px;
padding:0px
}
body.hmmessage
{
FONT-SIZE: 10pt;
FONT-FAMILY:Tahoma
}
</style>
</head>
<body class='hmmessage'><div style="text-align: left;">Hello Marti<br><br>At a first glance, your patch seems ok. I haven't had time to test it, since I'm at work now, but I do have some small comments/nitpicks :)<br>- There's a TANOKU-TODO in gui/dialog.h, which should be changed to a TODO<br>- I think that file gui/themes/scummodern/cursor.bmp is not properly defined as a binary file (the patch contains the file contents as text)<br></div>- scummtheme: perhaps this should mention and check what kinds of file extensions it parses? It's a bit ambiguous right now<br>- I noticed that some drawing hints in the current code have been removed in your patch altogether, without them being replaced by the drawing types you specified (e.g. in gui/console.cpp). Is this correct?<br>- Your patch only updates the MSVC9 project files, you can use the batch files inside the /dists folder to update all of them<br><br>Other than that, it looks ok to me at a first glance, nice work :)<br><br>I'll try and check if it compiles and works for me tonight<br><br>Regards<br>Filippos (md5/thebluegr)<br><br><hr id="stopSpelling">> Date: Wed, 8 Oct 2008 10:37:23 +0200<br>> From: tanoku@gmail.com<br>> To: max@quendi.de<br>> CC: scummvm-devel@lists.sourceforge.net<br>> Subject: Re: [Scummvm-devel] Merging the GUI branch<br>> <br>> Hello gentlemen:<br>> <br>> Since nobody has complained about the patch in the last 36h, I'm gonna<br>> assume it *is* working (it seems to work pretty well over here,<br>> anyways), and will commit the GUI merge to the trunk this evening;<br>> that is, unless someone has any last minute objections.<br>> <br>> You'll be able to find me on IRC when the trunk is totally trashed.<br>> <br>> Cheers,<br>> <br>> Vicent Martí<br>> ----------------<br>> http://www.smartlikearoboc.com<br>> <br>> <br>> <br>> On Mon, Oct 6, 2008 at 7:32 PM, Vicent Marti <tanoku@gmail.com> wrote:<br>> > Ah, the magical wonders of Subversion!! "Version control done right", they<br>> > said.<br>> ><br>> > Ok, on topic, the merge is ready and sitting on my hard disk. I've compiled,<br>> > done playtesting, ran all unit tests (pointless, I didn't even touch the<br>> > common code that is tested, but whatever), removed the old unused files, set<br>> > the svnprops and summoned the holy gods of the SVN branches to look over me.<br>> ><br>> > Attached is a SVN diff that should turn an up-to-date checkout of the trunk<br>> > into using the new GUI, hopefully without breaking anything. Apparently<br>> > Subversion is set to suck today, so the patch doesn't really remove the old<br>> > unused files (which are manually removed with svn rm on my local<br>> > repository).<br>> ><br>> > Whatever, after applying that patch those files are just ignored on compile<br>> > time, so... There goes the 24h countdown; I'm hoping that Max (and hopefully<br>> > some more awesome peeps) can apply the patch before tomorrow and make sure<br>> > it doesn't trash their branch.<br>> ><br>> ><br>> ><br>> ><br>> ><br>> ><br>> ><br>> > On Oct 6, 2008, at 2:25 PM, Max Horn wrote:<br>> ><br>> >> Vicent,<br>> >><br>> >> I can reproduce your merge problems. Very weird indeed. No idea what<br>> >> is causing them. Nor how to fix it...<br>> >><br>> >> Instead of wasting time trying to figure this one out, I propose that<br>> >> we instead perform a manual merge. This should be fine given that your<br>> >> changes are restricted to a small number of files:<br>> >><br>> >> Most stuff in gui/, as well as these (according to svnmerge's failed<br>> >> merge attempt):<br>> >><br>> >> C dists/msvc9/scumm.vcproj<br>> >> C dists/msvc9/scummvm.vcproj<br>> >> C engines/scumm/dialogs.cpp<br>> >> C engines/drascula/talk.cpp<br>> >> C engines/dialogs.cpp<br>> >> C engines/parallaction/saveload.cpp<br>> >> M engines/parallaction/objects.h<br>> >> C common/unzip.cpp<br>> >> M common/module.mk<br>> >> C + common/xmlparser.cpp<br>> >> M common/rect.h<br>> >> C + common/xmlparser.h<br>> >> A + graphics/VectorRenderer.h<br>> >> A + graphics/VectorRendererSpec.h<br>> >> C graphics/module.mk<br>> >> A + graphics/VectorRenderer.cpp<br>> >> A + graphics/VectorRendererSpec.cpp<br>> >> M graphics/font.cpp<br>> >> M base/main.cpp<br>> >><br>> >><br>> >> Assuming that your repos is synced with latest trunk, a manual merge<br>> >> could be as simple as "copy all modified files over to trunk, svn add<br>> >> new files, svn rm obsolete files". Then of course some test runs,<br>> >> maybe eyeballing of the "svn diff", and then just commit it...<br>> >><br>> >><br>> >> Cheers,<br>> >> Max<br>> >><br>> >> -------------------------------------------------------------------------<br>> >> This SF.Net email is sponsored by the Moblin Your Move Developer's<br>> >> challenge<br>> >> Build the coolest Linux based applications with Moblin SDK & win great<br>> >> prizes<br>> >> Grand prize is a trip for two to an Open Source event anywhere in the<br>> >> world<br>> >> http://moblin-contest.org/redirect.php?banner_id=100&url=/<br>> >> _______________________________________________<br>> >> Scummvm-devel mailing list<br>> >> Scummvm-devel@lists.sourceforge.net<br>> >> https://lists.sourceforge.net/lists/listinfo/scummvm-devel<br>> ><br>> ><br>> ><br>> <br>> -------------------------------------------------------------------------<br>> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge<br>> Build the coolest Linux based applications with Moblin SDK & win great prizes<br>> Grand prize is a trip for two to an Open Source event anywhere in the world<br>> http://moblin-contest.org/redirect.php?banner_id=100&url=/<br>> _______________________________________________<br>> Scummvm-devel mailing list<br>> Scummvm-devel@lists.sourceforge.net<br>> https://lists.sourceforge.net/lists/listinfo/scummvm-devel<br><br /><hr />See how Windows connects the people, information, and fun that are part of your life. <a href='http://clk.atdmt.com/MRT/go/msnnkwxp1020093175mrt/direct/01/' target='_new'>See Now</a></body>
</html>