Commit Graph

2427 Commits

Author SHA1 Message Date
Abdelrazak Younes
516ff470d8 Fix InsetBox drawing and remove remnant of the wide() hack.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20334 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-18 08:52:38 +00:00
Abdelrazak Younes
745d9ac46e * InsetCollapsable::draw(): replace use of dim_ with InsetText::dimension().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20331 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 22:18:07 +00:00
Abdelrazak Younes
85fa1e9efd remove InsetCaption::drawSelection(): this was not used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20328 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 21:51:32 +00:00
Abdelrazak Younes
2dc0945bda remove InsetCollapsable::drawSelection(): this was not used.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20327 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 21:48:25 +00:00
Abdelrazak Younes
74acf6b528 Cleanup the TEXT_TO_INSET_OFFSET mess. This correction is done now once in InsetText. Various other cleanup resulting from this change. In particular, pave the way to the removal of Dimension Inset::dim_ member by registering the inset dimension in RowPainter::paintInset() instead of InsetXXX::draw().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20326 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-17 21:45:14 +00:00
Bo Peng
6258199fe8 make index label translatable
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20318 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 14:43:10 +00:00
Bo Peng
18d587cb7e Display index name in InsetIndex label
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20313 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 14:08:16 +00:00
Lars Gullik Bjønnes
26f336769a Remove warnings reported with gcc 4.3:
- Modifier on return type ignored
	- Ambigous else
	- Ambigous logical operators
	- Semi-colon instead of empty block
	- Missing header files
	- Missing using std::XX
	- Initialization out of order


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20304 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-16 10:36:57 +00:00
Bo Peng
93196b1f73 Embedding: add a check box to InsetGraphic and show/change embedding status
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20297 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-15 18:31:32 +00:00
Martin Vermeer
a750970781 Force current font to red typewriter in ERT
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20261 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-13 14:29:44 +00:00
Bo Peng
ca281eaa0c Embedding: update related insets when the embedding status of a fileitem is changed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20240 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-12 14:27:47 +00:00
André Pönitz
887bd847c6 remove unnneded #include
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20233 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 22:31:24 +00:00
André Pönitz
9b8e429a64 remove unnecessary includes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20228 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 21:43:55 +00:00
Jürgen Spitzmüller
59c2e75e41 * src/insets/InsetCommand.{cpp,h}:
- implement edit function that opens the inset's dialog.
* src/BufferView.cpp (doDispatch):
	- call inset->edit (i.e. open dialog) for EDITABLE insets on next-inset-toggle (bug 2907)
* src/Text3.cpp (doDispatch: INDEX_INSERT):
	- move inset->edit to where it belongs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20193 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-10 16:06:01 +00:00
Bo Peng
3189e7b5dd Embedding: prepare to read/write manifest in .lyx file
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20186 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-10 03:54:02 +00:00
Uwe Stöhr
17112f655d Helge's wrapfig patch:
- Format incremented to 284
- LaTeX-package wrapfig is now used instead of flotflt for wrap floats (this allows us to implement now also a table wrap float)

(the optional overhang argument of wrapfig will be implemented later)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20185 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 23:47:22 +00:00
Abdelrazak Younes
c3e3534148 * TextMetrics::draw(): withdraw first row ascent before drawing because the convention is that the baseline of a multirow text is the baseline of the first row.
All other files: adapt to above change.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20177 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 20:21:43 +00:00
Bo Peng
2a1a156f47 Embedding: store inset pointer instead of ParConstIterator to enable more accurate navigation in the Embedding dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20164 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-09 07:07:13 +00:00
Martin Vermeer
2e5355e4c2 Convert CharStyle to Flex also in file format
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20138 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-08 13:01:29 +00:00
Bo Peng
d4a2219813 Embedding: remove AUTO feature, barely make it compile
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20119 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-07 03:02:24 +00:00
Martin Vermeer
2ddba774ce y-coord in Conglomerate, this time properly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20103 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 14:17:03 +00:00
Martin Vermeer
6089258acc Fix y co-ordinate for Conglomerate-style inset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20102 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 14:06:07 +00:00
Abdelrazak Younes
ea87429a23 Nicely align inset buttons with surrounding text.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20101 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 12:25:30 +00:00
Abdelrazak Younes
2d8b08b63c InsetCollapsable::draw(): Rename 'top' local variable to baseline as that's what it is really.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20100 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-06 12:00:32 +00:00
Abdelrazak Younes
95e09581c5 Fix alignment of text within insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20083 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 22:08:41 +00:00
Abdelrazak Younes
d9d7af7019 Fix drawing of collapsable inset without button.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20082 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 21:52:12 +00:00
Abdelrazak Younes
67905de3fc Fix tabular text y-positioning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20080 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 21:02:49 +00:00
Abdelrazak Younes
7e2d8d3955 Fix caption text y-positioning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20079 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 20:54:15 +00:00
Martin Vermeer
fe0f7858c2 Renaming CharStyle -> Flex, finishing touch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20076 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 18:40:56 +00:00
Bo Peng
c1e4304322 Embedding feature patch 5: handling of embedded files (operation without external files)
*  src/insets/InsetGraphicsParams.h|cpp:
	*  src/insets/InsetExternal.cpp: read/write buffer with embedded file
	*  src/insets/InsetGraphics.cpp: ditto
	*  src/EmbeddedFiles.h|cpp: add find() function


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20075 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 17:50:07 +00:00
Martin Vermeer
12e1d4bc8d Name change CharStyle -> Flex
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20072 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 15:29:04 +00:00
Abdelrazak Younes
67a2b3f28f Fix text frame drawing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20071 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 14:19:52 +00:00
Abdelrazak Younes
6a35e705a4 Fix cursor positioning withing collapsable insets.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20070 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 14:15:07 +00:00
Alfredo Braunstein
8158e25ab7 (InsetCollapsable::draw) restore background color (avoid psychedelic effects when selecting a note)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20069 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 13:52:43 +00:00
Abdelrazak Younes
d1813ca269 * TextMetrics::draw(): get rid of the first par ascent offset.
* BufferView::draw(): adapt to above change.

* InsetCollapsable::draw(): ditto -> get rid of textdim_ member.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20068 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 13:45:58 +00:00
Abdelrazak Younes
eed6514dd0 Move selection painting closer to row painting. Single row painting is now possible for selection.
* Row:
- setSelection(): set selection begin and end for this row.
- sel_beg, sel_end: new public members.

* BufferView::draw()
- do not trigger a full repaint for selection.
- use TextMetrics::draw() instead of hand calling TextMetrics::drawParagraph().

* InsetText::draw(): don't call TextMetrics::drawSelection().

* InsetMathMBox::drawSelection(): remove.

* TextMetrics:
- drawSelection(): simplify a bit. Now private.
- redoParagraph(): memorize Row selection status.
- x2pos(): fix crash when selecting with PageDown.
- draw(): fill-in the ParPos cache before everything else and not in drawParagraph().
- drawParagraph(): take care of row selection painting.







git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20066 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 13:04:05 +00:00
Edwin Leuven
e5c0c385ca rename method
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20043 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-04 18:13:19 +00:00
Edwin Leuven
39ee5b3fb2 renaming of some methods that hurt the eyes + removal of:
- column and row count, 
- tabular width and method that goes with it
- method declaration without implementation: void delete_column(col_type)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20032 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-04 10:52:08 +00:00
Alfredo Braunstein
a8ed1add4d rename Paragraph::isRightToLeftPar -> isRTL for the sake of consistence
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20031 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-04 10:27:55 +00:00
Abdelrazak Younes
2ea432bab1 * TextMetrics: getDisplayFont() and isRTLBoundary() takes pit instead of Paragraph.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20015 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 22:28:49 +00:00
Abdelrazak Younes
d35d25460b * Text: Move some more stuff from Text to TextMetrics:
- getFont() becomes TextMetrics::getDisplayFont()
- setCharFont() now needs a display font.
- setInsetFont() and setFont() now needs a BufferView, will be transferred to TextMetrics too.
- isRTL(): moved to TextMetrics
- isRTLBoundary(): ditto
- font_: ditto

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20014 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 21:48:49 +00:00
Abdelrazak Younes
bc6304d760 Don't save background color in Text. Hand it down at drawing time.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20002 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 14:34:15 +00:00
Abdelrazak Younes
e5ec07d513 * InsetText::font_: removed, this was not used anywhere.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20000 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 13:50:37 +00:00
Abdelrazak Younes
af06ed5ff1 Transfer current_font and real_current_font from Text to Cursor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19999 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 13:35:48 +00:00
Abdelrazak Younes
7150b25b7e * InsetCollapsable::metrics(): Allow a bit more inlined size.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19993 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 10:35:36 +00:00
Abdelrazak Younes
4048448236 Transfer metrics and screen related methods from Text to TextMetrics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19991 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 09:44:08 +00:00
Martin Vermeer
3f358459fc Final touch on minimalistic branches
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19989 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-02 08:38:09 +00:00
Abdelrazak Younes
452348f4ce * InsetCollapsable::metrics(): Put back the test previous to revision 14472 for openinlined_
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19985 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 23:01:21 +00:00
Martin Vermeer
8906059a0a Cleanup painting of corners
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19978 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 20:38:25 +00:00
Martin Vermeer
e0db6e2679 small cleanup collapsable; label fix branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19976 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-01 17:55:21 +00:00