]>
git.lyx.org Git - lyx.git/log
Stephan Witt [Fri, 29 Oct 2010 18:39:58 +0000 (18:39 +0000)]
add some documentation for CVS usage
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35915
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Fri, 29 Oct 2010 17:14:00 +0000 (17:14 +0000)]
Bit of cleanup around the Format view and edit code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35914
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Fri, 29 Oct 2010 17:08:31 +0000 (17:08 +0000)]
Constness.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35913
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Fri, 29 Oct 2010 17:02:01 +0000 (17:02 +0000)]
fix #6998. Center alignment is the default, also with multirow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35912
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 29 Oct 2010 16:51:50 +0000 (16:51 +0000)]
Move the call to Buffer::errors("Parse") from BufferView::insertLyXFile to GuiView::insertLyXFile.
Buffer::errors("Parse") is called 7 times in the whole project. 4 times from GuiView and three times from functions in other classes, but which are (almost) only called from the GuiView.
Buffer::errors is used to signal the GUI that there might be an error occuring, but what sense does it make if it is only called from the Gui ?
Isn't it better to let the function return wether it succeeded or not and let the GuiView take action in doing something with the possible errors.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35911
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 29 Oct 2010 16:26:32 +0000 (16:26 +0000)]
Relay the ReadStatus all the way up to the GUI also for Buffer::reload().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35908
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Fri, 29 Oct 2010 14:31:52 +0000 (14:31 +0000)]
This has to be delayed, since otherwise it provides the command before
the user gets to do so.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35907
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Fri, 29 Oct 2010 13:07:05 +0000 (13:07 +0000)]
Fix prettyref output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35906
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Fri, 29 Oct 2010 13:06:52 +0000 (13:06 +0000)]
Complete Jurgen's fix.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35905
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Fri, 29 Oct 2010 11:33:48 +0000 (11:33 +0000)]
* InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35902
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Fri, 29 Oct 2010 11:01:04 +0000 (11:01 +0000)]
* nn.po: correct (?) email address.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35901
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Fri, 29 Oct 2010 10:15:50 +0000 (10:15 +0000)]
* InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35899
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Fri, 29 Oct 2010 08:34:26 +0000 (08:34 +0000)]
* GuiDocument.cpp:
use translateIfPossible here, since the module names might be non-ASCII
(thanks rgh).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35898
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Fri, 29 Oct 2010 04:09:49 +0000 (04:09 +0000)]
InsetTabular: implement some SET/UNSET functions as prerequisite to fix #6985
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35897
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Fri, 29 Oct 2010 01:38:58 +0000 (01:38 +0000)]
GuiTabular.cpp: table caption inside table is only allowed for longtables (fixes regression to LyX 1.6.x)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35896
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Fri, 29 Oct 2010 01:29:53 +0000 (01:29 +0000)]
InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35895
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Fri, 29 Oct 2010 01:18:18 +0000 (01:18 +0000)]
GuiTabular.cpp: fix #6585
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35894
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 29 Oct 2010 00:46:21 +0000 (00:46 +0000)]
Remove InsetCommand::mailer_name_.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35893
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 29 Oct 2010 00:42:40 +0000 (00:42 +0000)]
Remove the now unused parameter of createDialogStr();
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35892
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Fri, 29 Oct 2010 00:25:28 +0000 (00:25 +0000)]
Remove the name parameter from string2params and params2string. We can always derive the name with insetName(params.code()).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35891
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 22:12:29 +0000 (22:12 +0000)]
Move saveCheckSum() call to Buffer::readFile(). Also, remove the
argument from that function. We are always saving the checksum for the
Buffer's file. The argument is a left-over from a time when we did the
wrong thing and saved it for e.g. the emergency file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35890
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 22:00:50 +0000 (22:00 +0000)]
Rename invisible buffers to hidden ones, thanks to John McC-D.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35889
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 20:23:39 +0000 (20:23 +0000)]
Typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35888
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 17:35:28 +0000 (17:35 +0000)]
Lemma definition for refstyle.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35887
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 16:31:14 +0000 (16:31 +0000)]
InsetParamsWidget should not just ignore the initialization data. I
don't know if there are similar issues with other dialogs based on it,
but this seems to fix it for GuiLabel.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35886
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 16:28:57 +0000 (16:28 +0000)]
Comments mostly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35885
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 16:28:16 +0000 (16:28 +0000)]
Fix typo.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35884
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 16:04:46 +0000 (16:04 +0000)]
Took out too much in r35582.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35883
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Thu, 28 Oct 2010 15:15:14 +0000 (15:15 +0000)]
Change the way we output formatted references under refstyle to avoid
some problems with the previous \\lyxref macro.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35882
a592a061 -630c-0410-9148-
cb99ea01b6c8
Stephan Witt [Thu, 28 Oct 2010 12:53:10 +0000 (12:53 +0000)]
autodetect automake changes, add --with-qt4-frameworks=yes/no to control CC flags to build with(out) nokias Qt4 frameworks, do not touch iconv path anymore
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35881
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Thu, 28 Oct 2010 12:32:32 +0000 (12:32 +0000)]
Fix bug #6589 (Crash when reverting to saved while cursor is in mathed)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35880
a592a061 -630c-0410-9148-
cb99ea01b6c8
Enrico Forestieri [Thu, 28 Oct 2010 11:13:47 +0000 (11:13 +0000)]
Fix bug #6965 (Crash editing ERT in math mode)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35879
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 27 Oct 2010 22:34:18 +0000 (22:34 +0000)]
Remove InsetRef::isLatex. This no longer needed as we always can access the Buffer nowadays from the Inset.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35874
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 27 Oct 2010 21:35:13 +0000 (21:35 +0000)]
Organize header files in src\insets.
- Functions that inherit from the same baseclass are grouped together with a command;
- Functions that inherit should not have a doxy entry;
- Other functions are also grouped together as much as possible;
- Some function don't need to be implemented if they return the same as the baseclass;
- and more.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35873
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 20:18:50 +0000 (20:18 +0000)]
Another compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35872
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 20:15:35 +0000 (20:15 +0000)]
Compile fix, sorry.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35871
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 20:05:38 +0000 (20:05 +0000)]
GuiNomencl.xxx: Rename to be in line with class name.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35870
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 20:01:49 +0000 (20:01 +0000)]
Migrate GuiNomencl to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35869
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 17:25:55 +0000 (17:25 +0000)]
Migrate GuiLabel to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35868
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 17:02:42 +0000 (17:02 +0000)]
Migrate GuiHyperlink to InsetParamsDialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35867
a592a061 -630c-0410-9148-
cb99ea01b6c8
Abdelrazak Younes [Wed, 27 Oct 2010 12:55:57 +0000 (12:55 +0000)]
InsetParamsDialog: fix Restore button enabling/disabling.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35866
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 27 Oct 2010 08:45:21 +0000 (08:45 +0000)]
Revert r32909: make input completion case sensitive again.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35864
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 27 Oct 2010 07:04:58 +0000 (07:04 +0000)]
Fix bug #6989: Be somewhat more secure with the homebrew dynamic asserts that were changed in r35855.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35863
a592a061 -630c-0410-9148-
cb99ea01b6c8
Kornel Benko [Wed, 27 Oct 2010 06:09:10 +0000 (06:09 +0000)]
typos and a comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35862
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 27 Oct 2010 04:53:27 +0000 (04:53 +0000)]
Add a lyx-file version of the files: Rules and Recommendations.
We might get this document a bit up-to-date.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35861
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Wed, 27 Oct 2010 00:42:43 +0000 (00:42 +0000)]
Fix two potential crashes due to invalid static_casts.
An example of a fatal function call is "gotoInset(this, NOTE_CODE, true)". Luckily we don't check for the contents in LFUN_NOTE_NEXT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35860
a592a061 -630c-0410-9148-
cb99ea01b6c8
Kornel Benko [Tue, 26 Oct 2010 19:38:45 +0000 (19:38 +0000)]
Make it compilable, missing parentheses
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35859
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 17:00:43 +0000 (17:00 +0000)]
Let's add one step of security more here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35858
a592a061 -630c-0410-9148-
cb99ea01b6c8
Jürgen Spitzmüller [Tue, 26 Oct 2010 16:53:59 +0000 (16:53 +0000)]
* GuiDocument.cpp: translate module names also in descriptions (bug 6987)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35857
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 16:45:21 +0000 (16:45 +0000)]
Remove some unnecessary static_casts and add two FIXMEs about casts that don't look safe.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35856
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 15:03:51 +0000 (15:03 +0000)]
Remove unneccessary uses of dynamic_cast from the code.
A dynamic_cast is necessary when:
- the object to be casted is from an external library because we can't add Qxxx::asXxxx() to Qt e.g.:
* QAbstractListModel to GuiIdListModel,
* QValidator to PathValidator,
* QWidget to TabWorkArea,
* QWidget to GuiWorkArea;
- the object is to be casted from an interface to the implementing class, because the Interface does not know by whom it is implemented:
* ProgressInterface to GuiProgress,
* Application to GuiApplication.
A dynamic_cast can be replaced by:
- already existing as***Inset() functions, e.g.:
* asHullInset(),
* asInsetMath()->asMacro(),
* asInsetText();
- a static_cast when we are sure this can't go wrong, e.g.:
* we are sure that CellData::inset->clone() is an InsetTableCell,
* in cases where we explicitly check it->lyxCode().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35855
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 13:27:06 +0000 (13:27 +0000)]
Buffer: Rename function names:
- rename readFromVC to extractFromVC because this function actually doesn't read anything as compared to readEmergency, readAutosave and so on.
- rename readEmergency and readAutosave to loadEmergency and loadAutosave just like loadLyXFile and loadThisLyXFile. Only in loadThisLyXFile we switch to the actually reading of a file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35854
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 13:19:26 +0000 (13:19 +0000)]
Compile fix.
I forgot this in the previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35853
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 13:17:10 +0000 (13:17 +0000)]
Buffer: Make Buffer::readFile() private.
It's strange to have a public interface which has a function loadLyXFile and a function readFile. A user of this class will be confused about the difference.
Therefore, loadThisLyXFile will be next to loadLyXFile to stress that loadThisLyXFile will not load another file ;). I don't know whether all of you like that this function just calls readFile, but it feels good this way. All public paths for loading a file will now go through loadThisLyXFile (i.e. the paths that come from loadLyXFile), while readFile is a pure private function. If this doesn't make sense, just shout.
I think this improves the readability of the class.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35852
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 12:54:31 +0000 (12:54 +0000)]
Buffer.h: Cleanup, Sorting, and Improvements:
- group the read and emergency/autosave functions,
- add comments to the functions,
- adjust visibility of functions,
- add FIXMEs to some functions which are still unneccesarily public.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35851
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Tue, 26 Oct 2010 12:34:04 +0000 (12:34 +0000)]
Adjust comments to the truth.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35850
a592a061 -630c-0410-9148-
cb99ea01b6c8
Uwe Stöhr [Tue, 26 Oct 2010 02:02:10 +0000 (02:02 +0000)]
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
Vincent van Ravesteijn [Tue, 26 Oct 2010 01:10:19 +0000 (01:10 +0000)]
Proper implementatiom of isInToc()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35846
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 25 Oct 2010 23:20:05 +0000 (23:20 +0000)]
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
Uwe Stöhr [Mon, 25 Oct 2010 22:13:52 +0000 (22:13 +0000)]
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
Uwe Stöhr [Mon, 25 Oct 2010 21:51:28 +0000 (21:51 +0000)]
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
Enrico Forestieri [Mon, 25 Oct 2010 21:36:25 +0000 (21:36 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 20:20:44 +0000 (20:20 +0000)]
InsetCommand.h: Reorder and add comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35840
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 25 Oct 2010 19:53:40 +0000 (19:53 +0000)]
Correct toc to floatlist
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35839
a592a061 -630c-0410-9148-
cb99ea01b6c8
Peter Kümmel [Mon, 25 Oct 2010 19:16:53 +0000 (19:16 +0000)]
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
Peter Kümmel [Mon, 25 Oct 2010 19:11:25 +0000 (19:11 +0000)]
update boost to 1.44
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35837
a592a061 -630c-0410-9148-
cb99ea01b6c8
Stephan Witt [Mon, 25 Oct 2010 17:49:45 +0000 (17:49 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 16:10:01 +0000 (16:10 +0000)]
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
Richard Heck [Mon, 25 Oct 2010 15:33:51 +0000 (15:33 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 15:21:08 +0000 (15:21 +0000)]
Properly convert from ReadStatus to boolean.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35833
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 25 Oct 2010 14:14:44 +0000 (14:14 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 13:55:39 +0000 (13:55 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 13:32:38 +0000 (13:32 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 13:29:50 +0000 (13:29 +0000)]
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
Stephan Witt [Mon, 25 Oct 2010 13:27:48 +0000 (13:27 +0000)]
#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
Vincent van Ravesteijn [Mon, 25 Oct 2010 13:04:13 +0000 (13:04 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 12:46:16 +0000 (12:46 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 12:31:22 +0000 (12:31 +0000)]
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
Richard Heck [Mon, 25 Oct 2010 12:24:15 +0000 (12:24 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 12:19:39 +0000 (12:19 +0000)]
Oops.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35823
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 25 Oct 2010 12:18:09 +0000 (12:18 +0000)]
FFix warnings in Buffer::readString.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35822
a592a061 -630c-0410-9148-
cb99ea01b6c8
Richard Heck [Mon, 25 Oct 2010 12:14:10 +0000 (12:14 +0000)]
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
Richard Heck [Mon, 25 Oct 2010 12:05:37 +0000 (12:05 +0000)]
Fix #3934. Patch from Guenter Milde.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35820
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Mon, 25 Oct 2010 11:57:56 +0000 (11:57 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 10:18:42 +0000 (10:18 +0000)]
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
Vincent van Ravesteijn [Mon, 25 Oct 2010 09:49:24 +0000 (09:49 +0000)]
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
Stephan Witt [Mon, 25 Oct 2010 08:12:01 +0000 (08:12 +0000)]
avoid warnings for unused parameters
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35816
a592a061 -630c-0410-9148-
cb99ea01b6c8
Stephan Witt [Mon, 25 Oct 2010 05:37:04 +0000 (05:37 +0000)]
* 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
Vincent van Ravesteijn [Mon, 25 Oct 2010 01:18:48 +0000 (01:18 +0000)]
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
Vincent van Ravesteijn [Sun, 24 Oct 2010 23:41:15 +0000 (23:41 +0000)]
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
Uwe Stöhr [Sun, 24 Oct 2010 22:18:36 +0000 (22:18 +0000)]
Tutorial.lyx: fix some quotation marks
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35810
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Sun, 24 Oct 2010 22:14:31 +0000 (22:14 +0000)]
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
Pavel Sanda [Sun, 24 Oct 2010 21:46:28 +0000 (21:46 +0000)]
gcc spits out million warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35807
a592a061 -630c-0410-9148-
cb99ea01b6c8
Edwin Leuven [Sun, 24 Oct 2010 21:41:47 +0000 (21:41 +0000)]
have pointing cursor when hovering something clickable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35806
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Sun, 24 Oct 2010 21:38:19 +0000 (21:38 +0000)]
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
Vincent van Ravesteijn [Sun, 24 Oct 2010 20:11:40 +0000 (20:11 +0000)]
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
Vincent van Ravesteijn [Sun, 24 Oct 2010 19:25:36 +0000 (19:25 +0000)]
Implement mouse hovering for InsetExternal.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35803
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Sun, 24 Oct 2010 19:24:36 +0000 (19:24 +0000)]
setMouseHover() functions can be const.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35802
a592a061 -630c-0410-9148-
cb99ea01b6c8
Vincent van Ravesteijn [Sun, 24 Oct 2010 17:27:32 +0000 (17:27 +0000)]
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
Stephan Witt [Sun, 24 Oct 2010 17:14:10 +0000 (17:14 +0000)]
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