anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-15 07:16:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,645 Commits 31 Branches 172 Tags 617 MiB
a7e2b7eea9
Commit Graph

25645 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jürgen Spitzmüller
d2b7bb6525 compile fix. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35792 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 08:29:57 +00:00
Vincent van Ravesteijn
f3ed8071d8 Fix #6597: LyX Appears frozen if the process holding the clipboard is frozen 
Implements CacheMimeData type so that we only need to query the
clipboard once on startup and once each time the contents of the
clipboard change. This is important as Qt takes 5 seconds to time-out when the clipboard is non-responsive.

Patch by John McCabe-Dansted.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35790 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 00:21:58 +00:00
Peter Kümmel
ad51a8e88e bind makes a copy of the arguments by default. This is secure if the 
bound object survives the existance of the arguments, but it also breaks
"change by non-const reference"  parameter passing, like in
Alert::askForString. Here the arguments exists the whole bound function
call so we could pass by refernce.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35789 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-23 00:06:22 +00:00
Vincent van Ravesteijn
d9c6263c6a Fix crashes and asserts if LyX doesn't have a view (on Mac for example). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35787 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 20:54:18 +00:00
Pavel Sanda
445436e078 Manual synchro with branch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35786 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 18:47:23 +00:00
Vincent van Ravesteijn
56bce65dd0 Restructure processFuncRequest* function family: 
- move a comment back from to GuiApplication to GuiView.cpp, so we have the comment in the place where we decide to process the func request asynchronously;

- rename dispatchDelayed to processFuncRequestAsync to have the same terminology as in the other processFuncRequest* methods;

- introduce a new function processFuncRequest to complete the set of processFuncRequest* methods. It is strange that for the normal processFuncRequest one should suddenly use lyx::dispatch. Besides, I think it is good that the whole GUI will dispatch funcRequests through GuiApplication::processFuncRequest from now on;

- use the slotProcessFuncRequestQueue to relay to processFuncRequestQueue;

- properly camelBump addToFuncRequestQueue;

- group the implementation of the processFuncRequest* functions;

- document the side-effect of processFuncRequestAsync.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35784 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 18:08:21 +00:00
Pavel Sanda
c497d0efe2 Also to trunk 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35783 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 18:05:07 +00:00
Vincent van Ravesteijn
f6c7f63f0b GuiApplication.h cosmetics: 
- reorder some function declarations,
- remove some declarations from the list of functions that inherit from Application,
- add and clarify some comments,
- whitespace.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35781 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 17:53:09 +00:00
Richard Heck
723b619317 Typo. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35780 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 17:08:57 +00:00
Jürgen Spitzmüller
a94fe452ff Fix bug 6944: crash on drag and drop multiple files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35779 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 15:46:46 +00:00
Jean-Marc Lasgouttes
9ebd4405cf Make sweave process files with the correct encoding (#6625). 
The required the introduction of the new converter token $$e, that holds
the iconv name of the latex file encoding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35772 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 07:51:39 +00:00
Pavel Sanda
b072429261 doc synchro with trunk 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35771 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 00:22:08 +00:00
Uwe Stöhr
b8ca0e7fd3 - lyxsweave.R: set missing SVN EOL style and add missing makefile entry 
- lib/Makefile.am: add missing scripts

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35769 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 00:10:18 +00:00
Uwe Stöhr
37de068138 scons_manifest.py: update SCons 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35768 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-22 00:08:13 +00:00
Pavel Sanda
71651db282 (no log message) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35767 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 23:34:22 +00:00
Richard Heck
b7b5c8cecd Comment. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35764 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 22:04:06 +00:00
Peter Kümmel
d3392418c4 use QWaitCondition instead of QEventLoop for waiting on GUI thread-call finished, it's cheaper 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35763 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 21:29:08 +00:00
Richard Heck
eafafd8121 Revert r35760, as suggested by Vincent. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35762 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 19:33:29 +00:00
Richard Heck
c5200a848e This one didn't make it to Unicode for some reason. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35761 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 19:15:31 +00:00
Richard Heck
1f87b2ef5d Restore should, uh, restore the initial state. Other half of #6964. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35760 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 18:25:15 +00:00
Richard Heck
74c8cfc5f5 Fix bug #6964. Problem was that we always saw the first branch. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35759 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 18:20:12 +00:00
Richard Heck
5aba6f4fab Make this a switch. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35758 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 18:01:06 +00:00
Richard Heck
bfa9991f93 Fix bug #6962. I hadn't see how these were being escaped. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35757 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-10-21 17:56:00 +00:00