anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,568 Commits 31 Branches 172 Tags 630 MiB
5518b04248
Commit Graph

25568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent van Ravesteijn
5518b04248 Adjust comments to the truth. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35850 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-26 12:34:04 +00:00
Uwe Stöhr
dbe3d79e15 InsetTabular.cpp: remove comment, we already discussed this and the star as default was the result 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35847 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-26 02:02:10 +00:00
Vincent van Ravesteijn
8693ae474b Proper implementatiom of isInToc() 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35846 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-26 01:10:19 +00:00
Vincent van Ravesteijn
2e42a7b645 We don't want InsetCommand to have a function updateCommand while this is not a special function of an InsetCommand, but only accidentally a shared function of two children. So, in this case I think we should just (dynamically) cast these objecten and call their own insetCommand function. 
This also fixes compilation again. I forgot to cherry-pick all commits in git ;)...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35845 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 23:20:05 +00:00
Uwe Stöhr
b7764dbe42 InsetCommand.h: revert my last commit - makes it worse than it helps as quick workaround 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35843 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 22:13:52 +00:00
Uwe Stöhr
8a4933f250 InsetCommand.h: reintroduce updateCommand from r35840 to make it compilable (this void is used in CutAndPaste.cpp); Vincent, can you please have a look? 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35842 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 21:51:28 +00:00
Enrico Forestieri
f967cd1c45 Proper fix for #6967 that does not reintroduce #6793 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35841 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 21:36:25 +00:00
Vincent van Ravesteijn
6e0f8f89b0 InsetCommand.h: Reorder and add comments. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35840 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 20:20:44 +00:00
Vincent van Ravesteijn
f270358904 Correct toc to floatlist 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35839 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 19:53:40 +00:00
Peter Kümmel
b1ad9a7c03 update boost to 1.43: remove obsolete files, update .cpp 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35838 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 19:16:53 +00:00
Peter Kümmel
228c1d22e4 update boost to 1.44 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35837 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 19:11:25 +00:00
Stephan Witt
85b1bba640 in client server mode CVS does not like full path operand for directory operation; LyX is in the repo dir already, so "." is used as target 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35836 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 17:49:45 +00:00
Vincent van Ravesteijn
e48942bbbb Fix bug #6550: "Any Changes will be lost" even when there are no changes. 
Patch from JOhn McCabe-Dansted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35835 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 16:10:01 +00:00
Richard Heck
3e53707570 Little bit of cleanup, motivated by need to squash a warning. 
The only substantive change here is moving the markDirty() call into the
first case. If we don't load the file successfully, then there is no
need to mark dirty.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35834 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 15:33:51 +00:00
Vincent van Ravesteijn
314232d2ff Properly convert from ReadStatus to boolean. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35833 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 15:21:08 +00:00
Vincent van Ravesteijn
80a09f4ea6 Merge readFile and readFile; and readFile and readString. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35832 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 14:14:44 +00:00
Vincent van Ravesteijn
5a30a98346 Buffer.cpp: 
Extract convertLyXFormat function that runs LyX2LyX.

(and some compile fixes)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35831 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 13:55:39 +00:00
Vincent van Ravesteijn
5f9b12ec39 Buffer.cpp: 
We need to save the checksum of the requested file. Not of the autosave file.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35830 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 13:32:38 +00:00
Vincent van Ravesteijn
aab708c594 Buffer.cpp: 
- Move the saveCheckSum to both autosave file as emergency file read function.
- Extract the function parseLyxFormat.
- Improve comment about the older LyX format numbers.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35829 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 13:29:50 +00:00
Stephan Witt
c6d4080694 #6396 no dialog when no doc changes were done and check-in or revert is done 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35828 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 13:27:48 +00:00
Vincent van Ravesteijn
80a5dd8144 Buffer.cpp: 
- Move some lines of code to more proper places.
- Let Buffer::readFile(FileName const &) return ReadStatus as well.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35827 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 13:04:13 +00:00
Vincent van Ravesteijn
c1a1d16967 Centralize the generation of the emergency and autosave filenames. 
Forgot this one in the previous commit.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35826 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:46:16 +00:00
Vincent van Ravesteijn
375db69d99 Centralize the generation of the emergency and autosave filenames. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35825 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:31:22 +00:00
Richard Heck
5cd48620f1 Return early again if there's nothing to do. Also, mark the buffer dirty 
only if we manage to read the autosave file successfully.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35824 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:24:15 +00:00
Vincent van Ravesteijn
1d55e97b2d Oops. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35823 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:19:39 +00:00
Vincent van Ravesteijn
1102636923 FFix warnings in Buffer::readString. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35822 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:18:09 +00:00
Richard Heck
1edd77ca30 Lessen indentation by returning early if there's nothing to do. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35821 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:14:10 +00:00
Richard Heck
b942b87e7d Fix #3934. Patch from Guenter Milde. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35820 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 12:05:37 +00:00
Vincent van Ravesteijn
df1c5ef611 Refactor Buffer.cpp: loadLyXFile(): 
- make a new function readFromVC(),
if the file does not exist, try to extract it from the version control (RCS),

- make a new function readEmergency(),
try to read the emergency file that is associated to the file we are trying to read,

- make a new function readAutosave(),
try to read the autosave file that is associated to the file we are trying to read,

- merge loadLyXFile() and readFileHelper(),
this new function now determines which file to read.

- add more ReadStatus elements to describe failures.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35819 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 11:57:56 +00:00
Vincent van Ravesteijn
75773f3c22 Use Buffer::ReadStatus as a return value for Buffer::loadLyXFile. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35818 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 10:18:42 +00:00
Vincent van Ravesteijn
058035bf2c One should use dynamic_casts for inheritance-based casting. 
(This is a little necessary clean-up of my tree.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35817 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 09:49:24 +00:00
Stephan Witt
a2c998d5d0 avoid warnings for unused parameters 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35816 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 08:12:01 +00:00
Stephan Witt
bcbe6ae960 * implementation of status check and use it for checkIn and revert. 
helps the user to avoid errors and leads to more informative messages.
* implementation of diff and use it for the repoUpdate operation.
* add the check for merge conflicts in checkOut.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35813 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 05:37:04 +00:00
Vincent van Ravesteijn
ba19e8b5dd Fix bug #1839: Ctrl+arrows don't move to next/prev table cell. 
Patch from Punyashloka Biswal.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35812 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-25 01:18:48 +00:00
Vincent van Ravesteijn
9fbc3dd5ba Fix bug #5878: Cursor position not restored in hidden documents. 
A hidden document does not have an associated Cursor. So, each time we create a new workArea, we should restore the cursor position.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35811 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 23:41:15 +00:00
Uwe Stöhr
5071c5b008 Tutorial.lyx: fix some quotation marks 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35810 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 22:18:36 +00:00
Vincent van Ravesteijn
1a9fe125f6 Update the cursor shape also when the cursor shape changes without a mouse move actions. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35808 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 22:14:31 +00:00
Pavel Sanda
0590c77d47 gcc spits out million warnings 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35807 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 21:46:28 +00:00
Edwin Leuven
4e5d3469f6 have pointing cursor when hovering something clickable 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35806 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 21:41:47 +00:00
Vincent van Ravesteijn
943288066d Fix bug #6968: isExternallyModified remains "true" after "Revert to Saved". 
I forgot to save the checksum after reloading.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35805 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 21:38:19 +00:00
Vincent van Ravesteijn
72a93582b0 Add virtual bool Inset::clickable(..) to be used to change the cursor. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35804 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 20:11:40 +00:00
Vincent van Ravesteijn
72569c42ba Implement mouse hovering for InsetExternal. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35803 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 19:25:36 +00:00
Vincent van Ravesteijn
a77d991e24 setMouseHover() functions can be const. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35802 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 19:24:36 +00:00
Vincent van Ravesteijn
8a550ba48a I don't like negated logic. Especially not if it leads to the use of more !-operations. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35801 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 17:27:32 +00:00
Stephan Witt
4b7ad8b864 validate version control status after buffer save-as, avoid that for saveBuffer() 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35800 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 17:14:10 +00:00
Vincent van Ravesteijn
70ed1095ec Fix bug #6967: Insert->Display Math should not insert a numbered formula and vice versa. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35799 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 16:12:22 +00:00
Stephan Witt
6749b1fa0a invalidate vcs data if user cancelled the registrer operation, otherwise the registrer cannot be called again 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35798 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-24 13:26:00 +00:00
Pavel Sanda
6147f97ddd Fix #6966. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35797 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 20:17:41 +00:00
Stephan Witt
b2137a65de validate version control status after buffer save or save-as 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35796 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 18:35:13 +00:00
Peter Kümmel
d0feccc7ed switch mouse to busy symbol every 3 seconds and then back to show the 
user something is done in the background


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35795 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 10:49:45 +00:00