Commit Graph

6163 Commits

Author SHA1 Message Date
Tommaso Cucinotta
5b1e7027ba Fixed Find LyX with replace, in common use cases.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31141 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-19 15:14:28 +00:00
Vincent van Ravesteijn
81403e78fc If we are in a close_event all children will be closed in some time, so no need to do it here. This will ensure that the children end up in the session file in the correct order. If we close the master buffer, we can close or release the child buffers here too.
We don't want a master buffer to release all its children immediately because that would close dirty childs without saving and would make it impossible to store the childs in a proper way in the session file. 

As, we close all children of a buffer together with the master itself, it is also no longer necessary to do it automatically. 

I'll leave it commented out for a while in case someone objects to it.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31130 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 21:18:21 +00:00
Vincent van Ravesteijn
252a8ca4a8 Let's make trunk compilable again.
This should have gone with r31127.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31128 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 20:51:43 +00:00
Vincent van Ravesteijn
b2588a80f3 - Ditch the in_close_event parameter, as we can use closing_ for this purpose.
- Add some comments for the functions.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31127 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 20:48:15 +00:00
Vincent van Ravesteijn
49d03a2576 If we are in a closeEvent, we don't want to close all buffers, because these may live in another View. So, only close the WorkAreas in this view.
For now, I stick to the convention that closing a buffer, will close it in all tabworkareas and all views. Therefore, when choosing File->Close All, we still close all buffers.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31126 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 20:41:29 +00:00
Vincent van Ravesteijn
64d7a33a89 Rename closeBufferAll to closeWorkAreaAll (because that's what we do). Add a new closeBufferAll function that closes all WorkArea's and then all hidden buffers. This is easy now, because we've done everything to prevent hidden buffers to be dirty.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31125 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 20:12:34 +00:00
Vincent van Ravesteijn
6e4ca1d18f Fix bug #5893: LyX closes hidden dirty buffers without asking.
Closing a tab group will now hide the buffers, but if buffers are dirty it will first ask you to save it.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31124 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 19:27:19 +00:00
Vincent van Ravesteijn
c694bbe6ea Dissect closeBufferAll and closeTabWorkArea. Unfortunately, I have two pass ugly parameters.
Forgot this one of course.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31123 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 19:05:04 +00:00
Vincent van Ravesteijn
0e5f082a57 Dissect closeBufferAll and closeTabWorkArea. Unfortunately, I have two pass ugly parameters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31122 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 19:04:39 +00:00
Pavel Sanda
be3b0b8a98 QTreeView strikes back
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31110 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 07:20:40 +00:00
Vincent van Ravesteijn
0cf46fe101 Don't close the buffer when it is a child.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31109 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-18 00:04:19 +00:00
Vincent van Ravesteijn
f781cdc021 Close the correct tab when clicking one while the active tab is in another tabworkarea. This is also in 1.6.3.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31108 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 22:33:49 +00:00
Vincent van Ravesteijn
6ab8377995 Rename tolastopened to in_close_event. I forgot this in r31106.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31107 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 22:24:38 +00:00
Vincent van Ravesteijn
0e3f25489e Simplify the code, and rename tolastopened to in_close_event. Rationale: when we are in a close event we want to store the last opened files, and we don't want to close any child buffers. Closing the child buffers now will crimple the last opened files in the session file (the order of tabs that is). Child buffers are closed anyway when we are in a close event.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31106 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 21:31:24 +00:00
Vincent van Ravesteijn
c76fca43bc Closing the children of a master can be done in closeWorkArea.
This fixes yet another bug. Previously, when a master was closed, its child buffers were also released without asking to save dirty buffers. (What a mess!).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31104 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 21:25:27 +00:00
Pavel Sanda
e58280676d Hint from Andre for QTreeView.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31100 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 18:43:25 +00:00
Vincent van Ravesteijn
92e8347613 Squeeze warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31093 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 15:06:40 +00:00
Pavel Sanda
4304901faf Add find debug level. Patch from Tommaso.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31092 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 14:39:00 +00:00
Pavel Sanda
788ae33371 Bullet's pref box glitch - looks like qt 4.5 changed some small finger paint and we need
to add small width so all bullets are again inside the area.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31090 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 14:22:40 +00:00
Pavel Sanda
c95d295fe1 This part of QTreeView is newer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31087 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 08:38:02 +00:00
Jürgen Spitzmüller
313f7a2842 * GuiIndices.cpp: cosmetics (corretly resize TW column).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31083 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-17 07:49:28 +00:00
Uwe Stöhr
5eeeea31e2 FindAndReplaceUi.ui: Use groupboxes to tell the user where to insert what, patch from Tommaso
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31076 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-16 00:51:02 +00:00
Vincent van Ravesteijn
372e539c6a Mark a buffer as clean when the user chose to discard the changes. This is a patch from Richard to make his emergency cleanup procedure in Buffer::~Buffer work.
Besides that, this can also been seen in 1.6.3. If you have a master and a dirty child, and the dirty child is the second tab, you'll see that when closing LyX, LyX will ask twice whether you want to save the file. Once if the file itself is closed, a second time if the master is closing all his children.

See also the previous commit that treats the case in which the tabs were switched around.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31074 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-16 00:26:14 +00:00
Vincent van Ravesteijn
263c012d4b Fix a crash when closing LyX while a master and a dirty child were open, and if the dirty child is the first tab.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31073 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-16 00:21:02 +00:00
Vincent van Ravesteijn
1520629d7c If we are hiding a buffer _and_ the buffer is visible in another view/tabgroup, then we don't need to ensure that the buffer is clean.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31065 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 21:46:39 +00:00
Vincent van Ravesteijn
845baf5016 Let's get rid of this strange Buffer * construction. After that I introduced the inMultiViews() function, it wasn't necessary anymore.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31064 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 21:33:37 +00:00
Vincent van Ravesteijn
5679ae92f2 Rename closeBuffer to closeWorkArea, because we'll have to await whether we'll actually close the buffer or not.
Now we can also pass the WorkArea we would like to close. This fixes also the problem that hideWorkArea still wasn't correct. That's a consequence of the fact that we relied on currentMainWorkArea(). I wanted to get rid of that anyway.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31063 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 21:29:14 +00:00
Vincent van Ravesteijn
67c59b8f49 Fix a bunch of assertions.
The first thing that bformat does is to check whether the string contains "%1$s". Otherwise it asserts.

Why didn't we see this happen before ? This was revealed by the emergency saves that Richard introduced in the Buffer dtor.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31062 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 20:47:46 +00:00
Vincent van Ravesteijn
7372c173a6 Make a new function to check whether a workArea is also shown in another view.
Use this function in closeBufferAll, and use closeBuffer to hide the buffer. Now, closeBuffer will decide whether we need to save the buffer or not. Previously, the buffer got hidden even if it was dirty.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31059 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 18:13:21 +00:00
Richard Heck
c5487a3682 Move emergencyWrite() from BufferList to Buffer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31056 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 16:34:54 +00:00
Richard Heck
45600e36eb Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31055 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 16:03:11 +00:00
Vincent van Ravesteijn
7044b156f0 Fix crash when closing a TabGroup. Probably introduced in r27525 and revealed in r30933.
In setCurrentWorkArea d.current_work_area_ is used which is invalidated by deleting the TabWorkArea.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31054 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 15:47:12 +00:00
Pavel Sanda
ab36804b6c Fix searching bug #6139.
Patch by Tommaso.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31053 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 15:35:14 +00:00
Vincent van Ravesteijn
ffea0ce1e9 Fix a crash when applying the preferences.
The problem is that all toolbars are deleted and thus also the LayoutBox, which I made a member of GuiView. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31051 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 14:34:00 +00:00
Vincent van Ravesteijn
3c91fecb61 Among other problems still left. At least close the right tab if you use the context menu.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31050 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-15 14:07:05 +00:00
Vincent van Ravesteijn
bbafbc884c Extend saveBufferIsNeeded with a parameter indicating whether the buffer is going into a hidden state. If so, and the user discards his changes, the buffer will be reloaded to discard the changes.
Now, the option "Hide Tab" uses closeBuffer and asks for saving intead of instantly removing the workArea.

This is part of bug #5893: we try to make sure that there are no dirty hidden buffers.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31043 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 23:12:21 +00:00
Vincent van Ravesteijn
81554c90f1 Move layout from GuiToolbar to GuiView. Now, it is possible to use the popup also when the Toolbar has not been visible before.
see: 
http://www.mail-archive.com/lyx-users@lists.lyx.org/msg75503.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31042 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 22:58:57 +00:00
Vincent van Ravesteijn
7215b099d3 Remove GuiToolbar * member from the LayoutBox ctor: Why should we limit a LayoutBox to the Toolbar and it doesn't even have to know where it is.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31041 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 22:47:57 +00:00
Pavel Sanda
7031c2bc5b Move to QTreeView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31040 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 20:37:22 +00:00
Pavel Sanda
1f8c4c3f26 Move to QAbstractItemView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31039 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 20:37:12 +00:00
Richard Heck
56146a9346 Constify a bunch of stuff that can be const.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31037 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 15:46:10 +00:00
Richard Heck
ea0501025e s/moduleList/theModuleList/ for style purposes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31036 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 15:37:34 +00:00
Vincent van Ravesteijn
d92ff67005 Adjust the work-around for bug #5957.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31031 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 14:58:52 +00:00
Uwe Stöhr
33eec90086 new document option to suppress the default date, fileformat change, fixes #5823
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31028 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-14 00:52:33 +00:00
Vincent van Ravesteijn
072237ab4b Fix assertion that was revealed in my tree.
This really has to be QComboBox::showPopup(). Otherwise, we'll hit the LASSERT(!d->inShowPopup_, /**/); in either LayoutBox::showPopup() or LayoutBox::Private::showPopup().

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31020 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-13 21:32:55 +00:00
Pavel Sanda
3fbe484391 Plenty unneeded headers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31000 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 22:47:01 +00:00
Pavel Sanda
70fdfa86df Fix order
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30999 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 22:37:22 +00:00
Pavel Sanda
dc18e925a8 Compil fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30998 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 22:22:26 +00:00
Abdelrazak Younes
5f2429b4e2 This move out the GuiLayoutBox class out of GuiToolbar where it was a mess. The new LayoutBox is less of a mess now but still a mess.
We need a proper LayoutModel class.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30995 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 21:51:10 +00:00
Vincent van Ravesteijn
797f13806d Whitespace and correct naming.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30994 a592a061-630c-0410-9148-cb99ea01b6c8
2009-08-12 20:06:29 +00:00