Notebook layout configuration (patch to test)

[Jenna]

After this discussion (http://forums.codeblocks.org/index.php/topic,19067.msg130499.html#msg130499) I started to think about this feature again.
And it looks like I found a solution.

I attach a patch that automatically saves the notebook layout in the project and workspace layout files.

Any tests, comments etc are welcome.

EDIT:
Incorrect patch removed, see next post.
new patch in http://forums.codeblocks.org/index.php/topic,19100.msg130737.html#msg130737

EDIT:
actual patch in http://forums.codeblocks.org/index.php/topic,19100.msg133926.html#msg133926

[Jenna]

Updated patch attached.
The former one was missing two lines, must have get lost when cleaning the code from debug messages.

Sorry !

The new patch also has tiny wx30 fixes.

You have to remove the old one and apply the new.

EDIT:
Tiny changes in a ew patch in: http://forums.codeblocks.org/index.php/topic,19100.msg130737.html#msg130737

EDIT:
actual patch in http://forums.codeblocks.org/index.php/topic,19100.msg133926.html#msg133926

[Jenna]

Another new patch, no real functional change.
But it makes sure the active tab of a control gets restored correctly (Split() always sets it to 0).

EDIT:
new patch with fixes for NOPCH build is attached here.

EDIT:
actual patch in http://forums.codeblocks.org/index.php/topic,19100.msg133926.html#msg133926

[oBFusCATed]

Please fix the nopch build, too:

Code

In file included from cbproject.cpp:46:0:
../../src/include/projectlayoutloader.h: In member function ‘bool ProjectLayoutLoader::LoadNotebookLayout()’:
../../src/include/projectlayoutloader.h:22:91: error: invalid use of incomplete type ‘class cbAuiNotebook’
In file included from ../../src/include/cbproject.h:19:0,
                 from cbproject.cpp:24:
../../src/include/projectmanager.h:29:7: error: forward declaration of ‘class cbAuiNotebook’
Makefile:961: recipe for target 'cbproject.lo' failed

[Jenna]

Please fix the nopch build, too:

This evening, if I'm back from work.

[Jenna]

Please fix the nopch build, too:

This evening, if I'm back from work.

New patch atttached.
No changes except the NOPCH fixes.

EDIT:
actual patch in http://forums.codeblocks.org/index.php/topic,19100.msg133926.html#msg133926

[oBFusCATed]

Building... I'll report if I see any problems...

[oBFusCATed]

I've got this crash. It happened after I've quickly closed some files just after I've opened a workspace with many test projects.

Code

#42 0x00007f1ccb1370ac in wxFatalSignalHandler () at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/unix/utilsunx.cpp:1109
#43 <signal handler called>
#44 0x00007f1c9ff3a800 in CodeCompletion::OnEditorClosed (this=0x1bc5c10, event=...) at codecompletion.cpp:2432
#45 0x00007f1cccadcae9 in Manager::ProcessEvent (this=<optimized out>, event=...) at manager.cpp:261
#46 0x00007f1cccae90e2 in PluginManager::NotifyPlugins (this=<optimized out>, event=...) at pluginmanager.cpp:1445
#47 0x00007f1ccca9f9f1 in EditorBase::~EditorBase (this=0x5abfc70, __in_chrg=<optimized out>) at editorbase.cpp:133
#48 0x00007f1ccca34131 in cbEditor::~cbEditor (this=0x5abfc70, __in_chrg=<optimized out>) at cbeditor.cpp:728
#49 0x00007f1ccb8a9c0f in wxWindowBase::Destroy (this=<optimized out>) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/wincmn.cpp:415
#50 0x00007f1ccc665467 in wxAuiNotebook::DeletePage (this=this@entry=0x1086ff0, page_idx=page_idx@entry=0) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/aui/auibook.cpp:3302
#51 0x00007f1ccca28928 in cbAuiNotebook::DeletePage (this=0x1086ff0, page=page@entry=0) at cbauibook.cpp:492
#52 0x00007f1cccaadc15 in EditorManager::Close (this=0x96dde0, editor=0x5abfc70, dontsave=dontsave@entry=false) at editormanager.cpp:646
#53 0x00007f1cccaadee3 in EditorManager::CloseActive (this=<optimized out>, dontsave=dontsave@entry=false) at editormanager.cpp:607
#54 0x0000000000492a93 in MainFrame::OnFileClose (this=0x168f920, event=...) at main.cpp:2642
#55 0x00007f1ccb133dfe in ProcessEventIfMatches (event=..., handler=<optimized out>, entry=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1239
#56 wxEvtHandler::ProcessEventIfMatches (entry=..., handler=<optimized out>, event=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1214
#57 0x00007f1ccb133f7c in wxEventHashTable::HandleEvent (this=<optimized out>, event=..., self=self@entry=0x168f920) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:906
#58 0x00007f1ccb134297 in ProcessEvent (event=..., this=0x168f920) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1301
#59 wxEvtHandler::ProcessEvent (this=0x168f920, event=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1272
#60 0x00007f1ccb134220 in ProcessEvent (event=..., this=0x168fc20) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1308
#61 wxEvtHandler::ProcessEvent (this=0x168fc20, event=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1272
#62 0x00007f1ccb134220 in ProcessEvent (event=..., this=0xf6b928) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1308
#63 wxEvtHandler::ProcessEvent (this=0xf6b928, event=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1272
#64 0x00007f1ccb134220 in ProcessEvent (event=..., this=0xf666c0) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1308
#65 wxEvtHandler::ProcessEvent (this=0xf666c0, event=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1272
#66 0x00007f1ccb134220 in ProcessEvent (event=..., this=0x100a900) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1308
#67 wxEvtHandler::ProcessEvent (this=0x100a900, event=...) at /var/tmp/portage/x11-libs/wxGTK-2.8.12.1-r1/work/wxPython-src-2.8.12.1/src/common/event.cpp:1272

[oBFusCATed]

Can you try this workspaces: http://cmpt.benbmp.org/codeblocks/test_projects/workspace_crashs.tar.bz2

[Jenna]

Can you try this workspaces: http://cmpt.benbmp.org/codeblocks/test_projects/workspace_crashs.tar.bz2

The crash is confirmed-
The cause is that the caption is not enough to distinguish between the tabs (obviously) if it's the same, so rebuilding the pane layout is broken, even if not closing any of the tabs.

[Jenna]

Can you try this workspaces: http://cmpt.benbmp.org/codeblocks/test_projects/workspace_crashs.tar.bz2

The crash is confirmed-
The cause is that the caption is not enough to distinguish between the tabs (obviously) if it's the same, so rebuilding the pane layout is broken, even if not closing any of the tabs.

Attached is a quick patch that should work unless the project/workspace path did not move.
If it has moved we run in trouble again, but that should also be fixable.
I will look into it this evening (hopefully).


EDIT:
New patch in next post.
Unfortunately the patch does not work with layout files created by the previous patch(es), so the layout files have to be cleared manually, saved with an unpatched C::B or removed.
Sorry.

[Jenna]

And another one.
Should work if the project gets moved around, because it uses relative pathnames and projectname as unique identifier.
This will still fail, if two projects in one workspace have the same name and files with the same name and relative path opened.

And if a new project gets opened in an already opened workspace the actual layout will be destroyed.

Catching the first issue is not easy, the second one should be easier to fix (hopefully).

For the first one, we could of course use some kind of hash (e.g. md5), but this might slow down loading, and it will (of course) not work, if files get changed from outside, which happens often in with vcs and it will still not work if two projects share the same file.

EDIT:

Just changed the patch, to one that works with newest wx-svn.

EDIT:
actual patch in http://forums.codeblocks.org/index.php/topic,19100.msg133926.html#msg133926

[LETARTARE]

@jens
I just tried this patch on svn9778, with the configuration described below.
Unfortunately it does not give the expected result.
I tried with and without plugin and the result is the same.
The first picture: two windows. The second image after reopening.

[Jenna]

@jens
I just tried this patch on svn9778, with the configuration described below.
Unfortunately it does not give the expected result.
I tried with and without plugin and the result is the same.
The first picture: two windows. The second image after reopening.

The patch should already work.
Nevertheless here comes a neweer version that tries to take care of newly loaded projects, so the perspectives of both layout-files get merged together.
All this will probably not longer work with the upcoming dynamic-aui, which will probably be merged before wx3.1.
The new aui also breaks a lot other stuff in our class derived from wxAuibook, but  have fixes for almost any problems with the dynamic aui-branch in my local repo.

EDIT:
actual patch in http://forums.codeblocks.org/index.php/topic,19100.msg133926.html#msg133926

[Jenna]

If it still does not work try to remove the *.layout-files and if it still does not work, it would be great if you could send me your default.conf .