Commit Graph

408 Commits

Author SHA1 Message Date
Vincent van Ravesteijn
e7f2bbe1ee Rename InsetXXX::contextMenu to InsetXXX::contextMenuName. Now this function doesn't need all the parameters and we split the functionality of choosing which context menu to return, from the functionality of supplying the name for the Inset itself. Now, the InsetText context menu is returned for InsetCollapsables when the button is not hit by the mouse. There is no (intended) change in functionality for insets without a button, collapsed insets. This fixes partly bug #6642. A fix for InsetTabular and for insets with no button will follow.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36604 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-29 21:27:25 +00:00
Uwe Stöhr
dc182537b4 InsetTabular.cpp: fine-tune vertical table alignment to get exactly the result of the latex output
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36494 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 22:49:05 +00:00
Uwe Stöhr
f11a0d3eaa InsetTabular.cpp: comments
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36493 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 22:06:31 +00:00
Vincent van Ravesteijn
f27853ad41 Cosmetics, typos and comments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36492 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 16:53:56 +00:00
Vincent van Ravesteijn
9fe6d655f3 Reuse some code and simplify InsetTabular::cursorPos()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36487 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:22:04 +00:00
Vincent van Ravesteijn
0fd75fefc4 Fix bug #7059: Display the vertical alignment of tables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36486 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:20:56 +00:00
Vincent van Ravesteijn
3c5b30a8ea Disentangle InsetTabular::drawSelection and InsetTabular::drawBackground().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36484 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:08:26 +00:00
Vincent van Ravesteijn
340b1b0473 Comment out code that does nothing. InsetTableCell does not handle drawSelection. Now it raises the impression that this causes the selection of the cells to be painted but that is done somewhere else.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36483 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-25 13:02:30 +00:00
Uwe Stöhr
934e013505 InsetTabular.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36420 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-21 04:45:07 +00:00
Uwe Stöhr
6cbbec8236 InsetTabular.cpp: fix #7055
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36415 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 18:59:16 +00:00
Uwe Stöhr
08f49bc27a InsetTabular.cpp: correct alignment for multirows:
- if column of multirow has no width, the alignment is that of the column
- otherwise multirows are fix left-aligned

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36403 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 07:57:35 +00:00
Uwe Stöhr
9672f432f2 InsetTabular.cpp: really fix #7007 this time
(the onlycolumn flag is not necessary in setAlignment (but in getAlignment) because it is in every case the same as !IsMultiColumn)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36402 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 04:53:34 +00:00
Uwe Stöhr
266b87357b InsetTabular.cpp: fix #7007
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36401 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-20 04:19:13 +00:00
Vincent van Ravesteijn
a3c01d2e25 Fix bug #7007: Horizontal table alignment display broken.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36395 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-19 03:31:13 +00:00
Pavel Sanda
a83995b2c6 Squash warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36195 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 18:45:26 +00:00
Uwe Stöhr
86b99f8f32 GuiTabular: support for multirow offset; fileformat change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36182 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-07 05:32:28 +00:00
Uwe Stöhr
7c2b2c464b InsetTabular.cpp: multirows are always left-aligned thus allow left alignment and forbid center alignment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35969 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:45:02 +00:00
Uwe Stöhr
90291acefb InsetTabular.cpp: typo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35968 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:12:46 +00:00
Uwe Stöhr
98b8e1eb81 InsetTabular.cpp: multirow cells are ALWAYS left aligned and thus cannot inherit the alignment of the column
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35967 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 17:09:38 +00:00
Uwe Stöhr
bc30270b35 InsetTabular.cpp: fix #7003 that I accidentally introduced when fixing #6958
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35966 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 16:16:40 +00:00
Jürgen Spitzmüller
9ef7efd85a whitespace
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35964 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 15:15:38 +00:00
Richard Heck
5c9dde4d3b Had to be a typo, right?
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35962 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 11:54:18 +00:00
Uwe Stöhr
c6fa2fa10e InsetTabular.cpp: fix #7000
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35957 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 04:30:06 +00:00
Vincent van Ravesteijn
34338c474a Remove unnecessary breaks.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35956 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 03:54:23 +00:00
Uwe Stöhr
fa695f939c InsetTabular.cpp: fix #6985 - we need to break after unsetting otherwise case Tabular::MULTICOLUMN: would be executed afterwards reverting the unsetting
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35955 a592a061-630c-0410-9148-cb99ea01b6c8
2010-11-01 03:26:25 +00:00
Uwe Stöhr
eb0c10b6b4 InsetTabular.cpp: multirows inherit the width and the alignment from the column; this fixes #6958 partly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35932 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 18:11:37 +00:00
Uwe Stöhr
eef6b32eff InsetTabular.cpp; remove SET_SPECIAL_MULTIROW because according to the multirow documentation multirows inherit the LaTeX-argument from the current column since they don't span multiple columns
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35931 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 16:36:08 +00:00
Jürgen Spitzmüller
a3a51b545c * InsetTabular.cpp:
- only set/unset a caption if necessary.

This fixes the setting of multicols via dialog (part of bug 6985)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35929 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-30 11:28:16 +00:00
Jürgen Spitzmüller
3381784318 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
2010-10-29 17:02:01 +00:00
Jürgen Spitzmüller
40f06a50de * InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35902 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 11:33:48 +00:00
Jürgen Spitzmüller
ec1fd2a860 * InsetTabular.cpp: simplification; no change in functionality.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35899 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 10:15:50 +00:00
Uwe Stöhr
fadde98eb3 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
2010-10-29 04:09:49 +00:00
Uwe Stöhr
c378fede8b 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
2010-10-29 01:29:53 +00:00
Uwe Stöhr
a0b84e0ba0 GuiTabular.cpp: fix #6585
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35894 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-29 01:18:18 +00:00
Vincent van Ravesteijn
573500dd04 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
2010-10-26 15:03:51 +00:00
Uwe Stöhr
dbe3d79e15 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
2010-10-26 02:02:10 +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
Uwe Stöhr
27423f93ba InsetTabular.cpp: fix #6907, patch by goriccardo
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35561 a592a061-630c-0410-9148-cb99ea01b6c8
2010-10-05 01:14:34 +00:00
Jean-Marc Lasgouttes
d71281d4ae MetricsInfo::textColor: helper function that helps taking in account the
selection and chage tracking state

InsetTabular::drawCellLines: use the above function to draw properly tabular lines after a selection. 

This method can be used easily for other insets.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35268 a592a061-630c-0410-9148-cb99ea01b6c8
2010-09-02 12:13:54 +00:00
Jürgen Spitzmüller
f2f3ed23f0 * InsetTabular.cpp: do not attempt to access an empty DocIterator (bug 6810).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35148 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-14 14:32:52 +00:00
Uwe Stöhr
7547cf9e5f - InsetTabular.cpp: floats must not be inserted to tables, fixes #6844
- InsetCaption.cpp: margin notes and footnotes are not allowed in captions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35073 a592a061-630c-0410-9148-cb99ea01b6c8
2010-08-07 03:16:38 +00:00
Richard Heck
0e14f379f3 Rename a couple routines. This will avoid confusion with a forthcoming
patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34816 a592a061-630c-0410-9148-cb99ea01b6c8
2010-07-08 20:04:35 +00:00
Vincent van Ravesteijn
7f593196fc Add an update parameter to BufferView::scrollToCursor and BufferView::scrollDocView. This parameter indicates whether a repaint is requested
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34658 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 21:48:23 +00:00
Edwin Leuven
c2e4c79f6e bit of cleanup to avoid ambiguities (in the sense of cell vs column)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34648 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-14 10:42:42 +00:00
Edwin Leuven
7b51fb74a7 columnWidth returns the col width of a cell, which is not what we want here (should fix tables flying of the screen)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34647 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-13 20:27:28 +00:00
Edwin Leuven
b031ac1e66 do not use cells without decimals when calculating column widths and cell text offsets
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34645 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-12 16:44:50 +00:00
Jean-Marc Lasgouttes
df62af4323 fix warnings
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34630 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-08 13:38:12 +00:00
Edwin Leuven
fea446303d simplify some conditions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34611 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-07 09:39:04 +00:00
Edwin Leuven
0ebe0ff37e add support for decimal alignment in tables
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34598 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-05 07:44:44 +00:00
Richard Heck
319ca06167 Rename LFUN_OPTIONAL_INSERT as LFUN_ARGUMENT_INSERT.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34597 a592a061-630c-0410-9148-cb99ea01b6c8
2010-06-04 22:53:44 +00:00
Vincent van Ravesteijn
5e978cf02c Disallow InsetMarginals in InsetTabulars.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34373 a592a061-630c-0410-9148-cb99ea01b6c8
2010-05-05 21:15:15 +00:00
Peter Kümmel
c9b9748cee msvcUsing "using namespace std" with msvc10 makes also std::tr1::shared_ptr visible and generates conflicts with boost::shared_ptr.
Solution: don't use boost::shared_ptr for msvc10 (could also be extended  to several GCC versions)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34259 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-22 11:37:32 +00:00
Vincent van Ravesteijn
3417702346 * FuncStatus: unify naming of functions.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34160 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-16 10:51:20 +00:00
Vincent van Ravesteijn
108a67ed43 Make Cursor::anchor_ private and make an access function Cursor::realAnchor() to stress the fact that this is thus not the normalAnchor().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34146 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-15 18:16:07 +00:00
Edwin Leuven
99366a9a44 correctly valign content of multirow cells
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34129 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-13 18:56:28 +00:00
Richard Heck
b79d8e5e2d Make members of FuncRequest private, per the FIXME there. Again, this is
basically a massive renaming, with no real changes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34106 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 19:00:42 +00:00
Richard Heck
4c7a5d0024 This is just a giant renaming of member variables in FuncRequest,
preparatory to making them private.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34105 a592a061-630c-0410-9148-cb99ea01b6c8
2010-04-09 18:15:17 +00:00
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