First thoughts on scriptkid's layout editor code

[sammydre]

scriptkid wrote:

i have had a look, but i couldn't compile. It seems that your forgot to commit "selection.h". I'm curious in seeing it work

Now time for a little nagging

To avoid this compile errors, can you try to make a temporary clean checkout and see if compiles? I think it's possible considering the projects' size.

I just did a clean checkout. Added "SelectionMover.cpp" into the project and it compiled without a complaint.

I'm unsure why you are having problems? I certainly committed "Selection.h", checking it with CVS log shows the following:

$ cvs log Selection.h

RCS file: /cvsroot/crayzedsgui/CELayoutEditor/inc/Selection.h,v
Working file: Selection.h
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2; selected revisions: 2
description:
----------------------------
revision 1.2
date: 2005/01/31 10:06:57; author: samtjansen; state: Exp; lines: +114 -119
Add ability to align selections of windows. The windows will be aligned to the f
irst window selected.
----------------------------
revision 1.1
date: 2005/01/23 16:49:33; author: patrick_kooman; state: Exp;
Initial commit.
=============================================================================

Some files seem to have unix line endings and some dos line endings in the repository. I'm not sure why this is. I had thought CVS was supposed to handle this for you.

[CrazyEddie]

I have examined the files, It seems there's something at your end that caused this

CVS does not handle the conversions on the server side, but is something normally done by the client; with this in mind it seems to be either a config error (which CVS client are you using on Windows there?), or some wierdness if you're somehow running a Unix client on Win32...

To prevent the possibility of further oddness (at the moment we just have 0D 0A bytes stored as line endings for affected files in the repository, but depending various things we may end up with 0D 0D 0A, and so on), someone who knows what they're doing needs to properly correct the line endings in the affected files and re-commit. I hereby volunteer for this job, so if scriptkid can let me know if he or I should correct this that would be great

CE.

[sammydre]

CrazyEddie wrote:
I have examined the files, It seems there's something at your end that caused this

CVS does not handle the conversions on the server side, but is something normally done by the client; with this in mind it seems to be either a config error (which CVS client are you using on Windows there?), or some wierdness if you're somehow running a Unix client on Win32...

Of course, that makes perfect sense - I blame cygwin. I use TortoiseCVS sometimes, but I find it gets a bit frustrating and drop back to cygwin because it generally feels a bit more natural. It is quite probable cygwin is defaulting to unix line endings where TortoiseCVS isn't.

[scriptkid]

sammydre wrote:
I just did a clean checkout. Added "SelectionMover.cpp" into the project and it compiled without a complaint.

I'm unsure why you are having problems? I certainly committed "Selection.h", checking it with CVS log shows the following:

Hey, that's weird. I'll have another look.

[scriptkid]

To prevent the possibility of further oddness (at the moment we just have 0D 0A bytes stored as line endings for affected files in the repository, but depending various things we may end up with 0D 0D 0A, and so on), someone who knows what they're doing needs to properly correct the line endings in the affected files and re-commit. I hereby volunteer for this job, so if scriptkid can let me know if he or I should correct this that would be great

CE.

I think the most easiest way would be if sammydre re-submits his files with TortoiseCVS, if he has the files in non-modified form backed up somewhere. Otherwise we can cleanup the repos, and submit our files again, but that's more of a last resort i think...

[CrazyEddie]

scriptkid wrote:
I think the most easiest way would be if sammydre re-submits his files with TortoiseCVS.

Sounds good to me

[sammydre]

scriptkid wrote:
I think the most easiest way would be if sammydre re-submits his files with TortoiseCVS.

I'll look into this when I get home from work today. Shouldn't be too hard to fix up.

[sammydre]

The new-line issue should at last be fixed up.

I've learnt my lesson!

[scriptkid]

sammydre wrote:
The new-line issue should at last be fixed up.

I've learnt my lesson!

Thanks, no more warnings about the linebreaks indeed
However some files we're appearantly saved with an extra linebreak. Can you tell me if you modified the following files:

CELayoutEditorDoc.cpp
ManagerDlg.cpp

If not, i'll just write my backed'up ones over it.

Thanks

[sammydre]

scriptkid wrote:
Can you tell me if you modified the following files:

CELayoutEditorDoc.cpp
ManagerDlg.cpp

I certainly modified CELayoutEditorDoc.cpp. I'm not sure what's up with ManagerDlg.cpp, I'm wondering if MSVC decided to add an include.

At any rate, you should be able to use cvs logs to figure out what I've changed. The CVS web interface on sourceforge is very handy

What do you mean about the extra linebreak though?

[scriptkid]

sammydre wrote:
At any rate, you should be able to use cvs logs to figure out what I've changed. The CVS web interface on sourceforge is very handy

Ok, i'll try that

What do you mean about the extra linebreak though?

[EDIT] Forget these lines, i used an anonymous account at my work, which of course has a delay. My registered account update looks fine now, thanks for fixing [/EDIT]