Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ Comment(by dak180): Replying to [comment:3 Safety0ff]: To dak180 and Buginator regarding Mac keymaps:[[BR]] Have you guys tried switching all the reference to Ctrl and meta for mac? The wz code seems to expects KEY_LMETA to be the command key, so I think this would keep things consistent.[[BR]] [[BR]] ...[[BR]] [[BR]] Also, I wouldn't call this a HACK (like you do in the comment,) because it is covered in the Qt documentation. I would not only call it a hack but a hack that is both ineffective and wrong. All the shortcuts that use ctrl elsewhere should be using cmd on the mac; it is what is expected on the platform. As a excellent example of this: the standard key combo for paste on the mac is cmd+v, not ctrl+v. Used properly (at least according to the docs) Qt handles all of this on its own, and in fact it was doing so, the only issue being that the keymap screen does not display properly (which these changes do not fix), the actual inputs worked correctly; that the display is not working says to me that we are most likely using something incorrectly. I would guess that it is related to the thing that makes it so (at least on the mac) no key combos using alt work. -- Ticket URL: http://developer.wz2100.net/ticket/1847#comment:5 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch -+-- Reporter: Buginator | Owner: Type: patch | Status: closed Priority: critical | Milestone: unspecified Component: other | Version: unspecified Resolution: fixed |Keywords: Operating_system: All/Non-Specific | Blockedby: Blocking:| -+-- Changes (by Buginator): * status: new = closed * resolution: = fixed Comment: merge completed in branch/qt-trunk. -- Ticket URL: http://developer.wz2100.net/ticket/1847#comment:6 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ Comment(by Buginator): r10811 - r10829 -- Ticket URL: http://developer.wz2100.net/ticket/1847#comment:4 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
On 5/10/10, Warzone 2100 Trac wrote: #1847: Preliminary qt-trunk merge patch ---+ The ETA on the merge should be this weekend or maybe next weekend, or whenever Cyp has time to do this on gitorious and then push to svn. I don't see a way to get added to gitorious, so I can push things to svn, once the merge is made. This has been postponing indefinitely, until we get a working CC version (I forgot all about this), and we can get a mac developer who has time to find out what the problem is with Qt on the mac. Also, for the main menu, somehow our openGL states are being reset / ignored with Qt's upkeep of the screen, and I don't know enough about Qt internals to know why. We still can do a merge from trunk into Qt though, to keep it up to date. ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
On Wed, May 12, 2010 at 3:51 AM, buginator buginato...@gmail.com wrote: This has been postponing indefinitely, until we get a working CC version (I forgot all about this), and we can get a mac developer who has time to find out what the problem is with Qt on the mac. This situation is very unfortunate. I have postponed all of the interesting things that I wish to work on waiting for the big three branches to be merged, because I need their features or to avoid generating massive conflicts. I understand that cyp is also waiting for a newnet merge. The situation is getting worse since our only active mac developer is unwilling to help get the Qt branch working on Mac, and is instead devoting his time to making a patch that will conflict massively with newnet. Can people please help out with fixing and merging the three branches (qt, newnet and lua) instead of doing other stuff? - Per ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
[warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ This patch is only meant to double check the merge work, and make sure everything looks OK. Not all the build systems are working/part of this patch, that will be in another patch. This is only meant for people to review what is in the patch. My thinking on actually doing the (final) patch would be to do the actual patch on gitorious (Looks like Cyp is the one who is active there), and push that to svn, so we can retain history with git, since svn sucks in that area. For what it is worth, the patch was made by cloning the gitorious repo, import that to hg, then told it to merge. I do not see a good way to handle this with svn, since, as with the other mass merges, we lose the history. Before the final patch is merged, we would make a new branch from the current trunk, and give it a nice codename like hydra or whatever, and not 3.0 as originally thought, since we are still unsure if 3.0 will actually use Qt backend or not. The ETA on the merge should be this weekend or maybe next weekend, or whenever Cyp has time to do this on gitorious and then push to svn. I don't see a way to get added to gitorious, so I can push things to svn, once the merge is made. -- Ticket URL: http://developer.wz2100.net/ticket/1847 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
[warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ This patch is only meant to double check the merge work, and make sure everything looks OK. Not all the build systems are working/part of this patch, that will be in another patch. This is only meant for people to review what is in the patch. My thinking on actually doing the (final) patch would be to do the actual patch on gitorious (Looks like Cyp is the one who is active there), and push that to svn, so we can retain history with git, since svn sucks in that area. For what it is worth, the patch was made by cloning the gitorious repo, import that to hg, then told it to merge. I do not see a good way to handle this with svn, since, as with the other mass merges, we lose the history. Before the final patch is merged, we would make a new branch from the current trunk, and give it a nice codename like hydra or whatever, and not 3.0 as originally thought, since we are still unsure if 3.0 will actually use Qt backend or not. The ETA on the merge should be this weekend or maybe next weekend, or whenever Cyp has time to do this on gitorious and then push to svn. I don't see a way to get added to gitorious, so I can push things to svn, once the merge is made. -- Ticket URL: http://developer.wz2100.net/ticket/1847 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ Attachment qt-trunk-merge.patch (104.0 KB) - added by Buginator -- Ticket URL: http://developer.wz2100.net/ticket/1847 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ Attachment qt-trunk-merge2.patch (0.6 MB) - added by Buginator Description: adding some build files, and other changes -- Ticket URL: http://developer.wz2100.net/ticket/1847 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ Comment(by Buginator): The qt-trunk-merge2.patch adds some more build files, and the Qt files, but the priority is still to check qt-trunk-merge.patch before this one. Will fix the rest tomorrow or so. -- Ticket URL: http://developer.wz2100.net/ticket/1847#comment:1 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
Re: [warzone2100-dev] [Warzone 2100 Trac] #1847: Preliminary qt-trunk merge patch
#1847: Preliminary qt-trunk merge patch ---+ Reporter: Buginator | Owner: Type: patch | Status: new Priority: critical | Milestone: unspecified Component: other |Version: unspecified Keywords: | Operating_system: All/Non-Specific Blockedby: | Blocking: ---+ Comment(by dak180): Replying to [comment:1 Buginator]: The qt-trunk-merge2.patch adds some more build files Please leave the mac build files out of the merge; I really need to go through them manually, trunk and qt have diverged too much for an automated merge to be useful. -- Ticket URL: http://developer.wz2100.net/ticket/1847#comment:2 Warzone 2100 Trac http://developer.wz2100.net/ The Warzone 2100 Project ___ Warzone-dev mailing list Warzone-dev@gna.org https://mail.gna.org/listinfo/warzone-dev
