Commit Graph

14846 Commits

Author SHA1 Message Date
Michael Schmitt
8c20105106 change tracking:
* changes.[Ch]: introduce isSimilarTo(...);
	restore original operator==;
	When merging two adjacent changes, the changetime is not considered,
	only the equality of the change type and author is checked (in method
	isSimilarTo(...)). If two changes are in fact merged (in method merge()),
	the later change time is preserved.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15608 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 21:48:23 +00:00
Bo Peng
b9c604e968 session: rename some functions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15607 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 20:01:00 +00:00
Peter Kümmel
969f292119 add comment about ugly construct
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15606 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 16:43:18 +00:00
Michael Schmitt
93ef470769 * rowpainter.C: remove unused variable 'inside',
a leftover from the axed nullpainter


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15605 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 16:39:51 +00:00
Georg Baum
7fd7b25a3c Fix more member variable initialization order warnings from gcc.
Does nobody care about this???



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15604 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 16:16:00 +00:00
Georg Baum
1440f02a84 Add comment explaining the encoding change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15603 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 16:08:07 +00:00
Martin Vermeer
e656777a92 * layout2layout.py
(convert): remove spurious tabs



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15599 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 11:41:15 +00:00
Peter Kümmel
577eaa14f8 Show Change Tracking toolbar, prepare hiding/positioning:
- src/frontends/Toolbars.h: control displaying of CT toolbar with a parameter
 - src/frontends/Toolbars.C: control displaying of CT toolbar with a parameter
 - src/frontends/LyXView.C : show CT toolbar
 - src/ToolbarBackend.C    : add CT toolbar to default.ui as REVIEW
 - lib/ui/default.ui       : add CT toolbar to default.ui
 - src/ToolbarBackend.h	   : add CT toolbar type  REVIEW



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15598 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 11:13:46 +00:00
Peter Kümmel
13aaaf3b2f fix bug: table toolbar icons in menubar, hiding will be handled by the next patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15597 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-29 10:42:21 +00:00
Peter Kümmel
32e777c786 remove warning, use shorter code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15595 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 17:14:51 +00:00
Michael Schmitt
5d166accfe * qt4/GuiFontMetrics.C: remove qt3 compatibility code
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15594 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 16:01:12 +00:00
Abdelrazak Younes
37e8b2c0f4 Compilation fix for Mac and Linux:
* add QWidget header.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15593 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 15:28:18 +00:00
Abdelrazak Younes
451b12d00d * LyXLex::Pimpl::buff is now a string.
* unicode.[Ch]:
 - new non template iconv_convert()
 - iconv_convert() template use above function.

* docstring.C:
 - utf8_to_ucs4(): new function, use the new iconv_convert() function above.
 - from_utf8(): use utf8_to_ucs4() function above.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15592 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 15:16:30 +00:00
Bo Peng
b884dee79e src/session.h: add virtual destructor to stop compiler complaints.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15591 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 15:14:28 +00:00
Abdelrazak Younes
3c296efd19 simplify paintText() interface.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15590 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 09:59:43 +00:00
Abdelrazak Younes
54bdecdb48 remove paperHeight() and paperWidth() in Painter and inherited classes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15589 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 09:36:22 +00:00
Abdelrazak Younes
56be946751 delete unused code and comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15588 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-28 09:19:37 +00:00
Abdelrazak Younes
9b89f1d4ad stop/start the blinking cursor when the WorkArea get a focusInEvent or focusOutEvent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15586 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 23:26:52 +00:00
Abdelrazak Younes
1372f311d3 replace the map based width cache with an array based one.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15585 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 22:46:36 +00:00
Abdelrazak Younes
7f94f08bbe * GuiFontMetrics: new metrics(QString) method
* QLPainter::paintText(): use GuiFontMetrics::metrics(QString) to avoid an ucs4 to QString conversion.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15584 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 21:27:03 +00:00
Bo Peng
f43176aebc include <cmath> in src/changes.C for std::abs(double)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15582 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 16:33:27 +00:00
Bo Peng
0fc684e6e6 class session reorganization
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15581 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 14:18:03 +00:00
Abdelrazak Younes
d916db37b0 MacOSX optimisation:
* QLPainter::paintText(): use the font width cache instead of the painter metrics.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15580 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 13:36:23 +00:00
Peter Kümmel
2dae7cce1a don't trigger the copy ctor because it's private on msvc
CCMAIL:lyx-devel@lists.lyx.org



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15579 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 13:10:06 +00:00
Peter Kümmel
1b698a8218 no abs for int64 values with msvc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15578 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 13:04:21 +00:00
Peter Kümmel
fe784fe9d3 when we use QDesktopWidget we should include it
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15577 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 11:47:59 +00:00
Edwin Leuven
91d32deed9 have row on 1 line when exporting to latex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15576 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 09:54:56 +00:00
Abdelrazak Younes
87de304f6e MSVC compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15575 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 09:41:32 +00:00
Peter Kümmel
a96cb88ccd GuiView.C: recover from silly window positions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15574 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-27 08:40:08 +00:00
Michael Schmitt
af54be2d01 change tracking:
* src/paragraph_pimpl.C: in method erase(),
	set the character to DELETED if
	a) it was previously unchanged or
	b) it was inserted by a co-author



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15573 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 21:06:55 +00:00
Michael Schmitt
c1dbcb6f06 change tracking:
* src/paragraph_pimpl.C: only reject an inset's content
	if the inset itself is UNCHANGED


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15572 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 20:44:00 +00:00
Michael Schmitt
62b09e3dbd change tracking:
* src/paragraph_pimpl.C: do not propagate changes
        to nested insets of the change type is DELETED


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15571 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 20:19:45 +00:00
Michael Schmitt
ae1346990b change tracking:
Better change time handling. Quote from Changes.C:

  Class Change has a changetime field that specifies the exact time at which
  a specific change was made. The change time is used as a guidance for the
  user while editing his document. Presently, it is not considered for LaTeX
  export. To avoid that every keystroke results in a separate change, a
  tolerance interval of 5 minutes is used. That means if there are two adjacent
  changes that only differ in their change time with abs(ct1 - ct2) < 300 sec,
  they will be merged (and the later change time is preserved).
  Technically, the check for equality (or similarity) is made in
  operator==(...). The merging of similar changes happens in method merge().

Resolve FIXMEs for LyX & LaTeX output.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15569 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 19:00:28 +00:00
Peter Kümmel
213c04d0a5 disable checked iterators for msvc release builds to get maximum speed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15568 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 18:38:46 +00:00
Peter Kümmel
a932a994f0 switch ENABLE_ASSERTIONS macro with _DEBUG macro
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15567 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 17:11:34 +00:00
Georg Baum
0a48dce7ac Compile fix for older gcc's.
I accidentally used data() which is not yet in the standard.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15565 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 15:38:53 +00:00
Georg Baum
fa1856440c Restore inputenc support
* src/encoding.h
	(encoding_table): remove, this is no longer needed with unicode
	(iconvName_): new member: name of the encoding in iconv syntax

	* src/exporter.C
	(Exporter::Export): Use return value of Buffer::makeLaTeXFile

	* src/buffer.[Ch]
	(Buffer::makeLaTeXFile): return whether the file has been created
	successfully

	* src/buffer.C
	(Buffer::makeLaTeXFile): Use a docstream that converts to the correct
	encoding
	Display an error dialog is something went wrong

	* src/bufferparams.C
	(BufferParams::writeLaTeX): Undo the utf8 inputenc hack

	* src/frontends/qt4/QDocumentDialog.C: Add some FIXMEs

	* src/support/unicode.[Ch]
	(eightbit_to_ucs4): New conversion function
	(ucs4_to_eightbit): New conversion function

	* src/support/docstream.[Ch]
	(utf8_codecvt_facet_exception): Move to header and rename to
	iconv_codecvt_facet_exception
	(odocfstream): Take the encoding as argument

	* src/support/docstream.C
	(utf8_codecvt_facet): Generalize to other encodings than utf8 and
	rename to iconv_codecvt_facet

	* src/encoding.C: Remove obsolete tables

	* src/output_latex.C
	(TeXOnePar): Convert the paragraph to different encoding if needed

	* lib/encodings: Remove obsolete tables


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15564 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 15:01:45 +00:00
Georg Baum
35847cdad8 Make the code a bit more python-like
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15563 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 14:43:58 +00:00
Jean-Marc Lasgouttes
f113c9b63d add Ran Rutenberg as new contributor
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15560 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 14:28:44 +00:00
Jean-Marc Lasgouttes
708abe8d95 update Hebrew translation of Intro
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15559 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 13:47:16 +00:00
Abdelrazak Younes
97c3e3f33c paintText(): replace the test on BufferView::buffer() with an assertion as this should not happen anyway.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15557 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 13:36:04 +00:00
Abdelrazak Younes
128a8ef3e8 This commit fixes 3 crashes when reverting a document:
1) crash in GuiWorkArea::paintEvent(), this one is solved by by encapsulating the file loading in LyXView by busy(true)/busy(false) and by disabling/enabling the work area update in GuiView::busy().

2) crash in the cursor blinking because the cursor is timed out at the moment you click on "Revert". So the blinking cursor is now disabled/enabled in GuiView::busy().

3) crash in BufferView::setBuffer() because the current buffer was already closed folling the "revert" command. 
* BufferView::loadLyXFile(): set buffer_ to 0 in case of a reload (when document is reverted)

* LyXView:
  - busy() is not const anymore (work_area_ is modified in GuiView) 
  - loadLyXFile(): encapsulate the file loading with busy(true)/busy(false)
  - setBuffer(): encapsulate the buffer-switching with busy(true)/busy(false)

* GuiView::busy()
  - disable/enable workarea updates.
  - disable/enable blinking cursor.

* WorkArea: new startBlinkingCursor() and stopBlinkingCursor() methods.

* rowpainter.C:
  - paintText(): make sure there is a Buffer from which to paint.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15556 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 13:29:10 +00:00
Peter Kümmel
b6a7dd3aa7 src/frontends/qt4/GuiWorkArea.C:
use position returned by BufferView
src/bufferview_funcs.C: 
    adjust cursor x-position by hand



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15555 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 11:01:34 +00:00
Abdelrazak Younes
e0c193fa92 add some initialization and some assertion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15554 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 08:10:22 +00:00
Abdelrazak Younes
1e3d50b669 Fix (hopefully) gcc warning about initialization order in constructor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15553 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-26 08:01:48 +00:00
Georg Baum
06139fb170 Port InsetCommandParams::scanCommand to lyx2lyx.
Now we can parse all commands that could be parsed in the old
InsetCommandParams


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15551 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-25 20:08:44 +00:00
Georg Baum
7dba7817ce missing bits of the new galician translation
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15550 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-25 19:03:36 +00:00
Peter Kümmel
4f8939dd3d cmake: precompiled headers
- enable by default, could be disabled with -Ddisable-pch
    - use different pch files for Debug/Release/...
    - use only one config_pch.C 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15549 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-25 17:57:04 +00:00
Joost Verburg
8fa888a61a Changed default date formatting string to be compatible with both Windows/UNIX. This solves crashes on Windows systems.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15546 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-25 10:28:29 +00:00
Edwin Leuven
6b20411c6a add fixme for cursor positioning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15544 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-25 09:20:07 +00:00