Commit Graph

301 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
bb69584112 Introduce InsetPreview.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33890 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-28 13:47:50 +00:00
Edwin Leuven
dba368d291 silence compiler warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33830 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-22 00:42:01 +00:00
Edwin Leuven
9713edcce2 comments and housekeeping
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33823 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-21 12:15:25 +00:00
Uwe Stöhr
2211213cb9 InsetTabular.cpp: remove FIXME as nothing needs to be fixed
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33817 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-21 04:29:22 +00:00
Edwin Leuven
fbc91c1967 forgotten in r33799
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33810 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-20 10:20:28 +00:00
Edwin Leuven
1a1bf4988b fix the drawing for cells with a specified vertical alignment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33799 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-19 09:41:31 +00:00
Edwin Leuven
1e67084666 revert awful spaghetti (r33780)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33793 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 19:02:01 +00:00
Abdelrazak Younes
bfe352d39d Fix gcc-4.4 warnings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33791 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-18 14:00:44 +00:00
Uwe Stöhr
9231f19340 InsetTabular.cpp:
- reintroduce issue that was removed in r33731
  (multirow cells are by default left-aligned, LyX does not yet support to change this)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33782 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 22:48:07 +00:00
Edwin Leuven
28c759e171 correct cell line drawing for multirow cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33781 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 22:42:57 +00:00
Uwe Stöhr
76ff0540d1 InsetTabular.cpp/h: fix the drawing for cells with a specified vertical alignment
Please also see my according post on the mailing list

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33780 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 22:27:17 +00:00
Edwin Leuven
1f8b6f8a0a - deleteRow did not properly change multirows
little things:
- rename method to what it is
- correct parameter
- bit of formatting

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33774 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 21:42:16 +00:00
Edwin Leuven
613f9d8996 and also correctly draw selected multicolumn cells while we're at it...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33765 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 09:50:58 +00:00
Edwin Leuven
7ff4105558 correctly draw selected multirow cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33764 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-16 09:46:25 +00:00
Edwin Leuven
62b0691b3c avoid invalidated indexes with multicol/row
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33751 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-15 18:08:38 +00:00
Edwin Leuven
3c45586d96 use more flexible default for now...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33739 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-14 10:33:02 +00:00
Edwin Leuven
b5ddcaa4d1 increment in the same way in ::draw, ::drawSelection and ::cursorPos
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33733 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-13 12:00:37 +00:00
Edwin Leuven
559537c080 fix some vertical alignment issues in tabular
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33731 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-13 10:49:26 +00:00
Jean-Marc Lasgouttes
b8bbd7aea9 Cleanup InsetTabular::getStatus
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33690 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-09 23:04:59 +00:00
Edwin Leuven
684def2036 simplify
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33688 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-09 19:21:32 +00:00
Edwin Leuven
93830fd28d avoid crash when calling inset_modify with cursor not in table
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33687 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-09 19:07:54 +00:00
Edwin Leuven
f7ef9c3e6e lil' cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33666 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 04:08:11 +00:00
Edwin Leuven
f313bd6a90 erratum to r33628
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33665 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-08 04:04:56 +00:00
Edwin Leuven
ece4da2f01 fix cursor position(ing)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33663 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-07 17:33:33 +00:00
Edwin Leuven
42c5246b9d rename frenzy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33628 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 18:10:34 +00:00
Uwe Stöhr
eb0ade4e9f InsetTabular.cpp:
- multirow cells are always left aligned, therefore disable horizontal alignment
- multirows cannot be vertically aligned, therefore disallow this

(Two issues less in http://wiki.lyx.org/Devel/Multirow .)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33622 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-05 03:37:21 +00:00
Edwin Leuven
f365532e35 remove old "logic"
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33620 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 21:31:06 +00:00
Edwin Leuven
9b93ec0732 - unset multicol (row) when setting multirow (col)
- bit of function cleanup


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33619 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 20:20:45 +00:00
Uwe Stöhr
20fbd7068a InsetTabular.cpp: fix bug that LyX allowed to specify the vertical alignment of table columns without a fixed width
Should also go to branch, Jürgen?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33615 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 03:55:13 +00:00
Uwe Stöhr
497d6d13f7 InsetTabular.cpp: disallow the following cases:
- a multirow cannot be a multicolumn the same time
- a multirow cannot be the caption of a longtable

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33614 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-04 03:27:30 +00:00
Richard Heck
d65020b293 s/updateLabels/updateBuffer/g, per a suggestion of Abdel's.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33613 a592a061-630c-0410-9148-cb99ea01b6c8
2010-03-03 22:13:45 +00:00
Jean-Marc Lasgouttes
a9d094bcce fix compiler warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33544 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-23 08:00:29 +00:00
Edwin Leuven
3c765c6bc5 bit of clean up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33522 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 22:00:54 +00:00
Abdelrazak Younes
3ec48cce2a Fix single table action (from toolbar).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33511 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 12:21:49 +00:00
Abdelrazak Younes
addba25b98 r33506: better fix for table borders.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33507 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 10:03:03 +00:00
Abdelrazak Younes
816b7fdd91 Simplify featureAsString()... I don't understand why some people insist
on those complicated, verbose STL code...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33504 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-19 08:11:09 +00:00
Abdelrazak Younes
e92aed709b Fix gcc warning.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33503 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-18 11:52:18 +00:00
Abdelrazak Younes
b5049e769b * InsetTabular cleanup:
- proper message passing for all tabular features
- properly define which feature needs an argument

* replace LFUN_TABULAR_FEATURE with LFUN_INSET_MODIFY
- The math tables are also affected. In the future a common base class
between math and text table will solve this inconsistency.
- There is a hack in GuiApplication in order to not rename the toolbar
icons. This will have to be cleaned up with a general icon naming for
LFUN_INSET_MODIFY... to be discussed.

* Tabular Dialog:
- big cleanup, lots and lots of bug fixing here
- migrated to InsetParamsWidget


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33495 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-18 08:28:46 +00:00
Edwin Leuven
8918e5df37 delete unused variable, fix multicolumn and some clean up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33453 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-12 18:36:20 +00:00
Uwe Stöhr
8bb69f24b6 support for multirows in tables:
- fileformat change (lyx2lyx code follows the next days)
- the patch is a joint work of Edwin and me

The patch is huge but the major parts work already. I put it in now as the minor known issues can be solved step by step the next days. I think this is the best solution because collaborating with such large patches already lead to copy/paste bugs.

The known issues are listed here:
http://wiki.lyx.org/Devel/Multirow

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33414 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-11 01:07:54 +00:00
Abdelrazak Younes
377cdd5f6c Transfer LyXfunc code to GuiApplication::dispatch() and getStatus(). Now
a lot of simplification is possible. Except some instability period...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33389 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-09 16:11:13 +00:00
Jürgen Spitzmüller
5b2d31fbb1 * InsetTabular.cpp (addToToc):
- pass correct iterator (and prevent assertion).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33247 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 12:25:43 +00:00
Jürgen Spitzmüller
bc5fd28ddf * InsetTabular.{cpp, h}:
- implement addToToc (bug 6372).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33240 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-28 08:33:14 +00:00
Richard Heck
caa4e94bf0 Get rid of some magic booleans in updateLabels() and related routines.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33110 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-20 19:42:12 +00:00
Richard Heck
3e654186d2 Move the StartTag, EndTag, and CompTag classes into the html namespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33099 a592a061-630c-0410-9148-cb99ea01b6c8
2010-01-19 22:08:04 +00:00
Vincent van Ravesteijn
87085fa2fd Set the current font when moving into a table or between two table cells.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32570 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-17 17:47:09 +00:00
Richard Heck
80ce542440 A little more CSS for tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32532 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:57:54 +00:00
Richard Heck
505cccfe7d Add some CSS for tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32528 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 16:05:36 +00:00
Richard Heck
5f04bedb1c Fix multicolumn output.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32526 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:44:49 +00:00
Richard Heck
93c121cfaa Remove dead code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32525 a592a061-630c-0410-9148-cb99ea01b6c8
2009-12-14 15:40:54 +00:00