Commit Graph

3266 Commits

Author SHA1 Message Date
Jürgen Spitzmüller
ef31f02ca5 backport rev. 29324:
Timestamp: 
04/19/09 13:57:52
Author: 
spitz 
Message: 
Implement a warning dialog with a "Do not show this warning again!" checkbox.
Since Qt does not provide this, we have to roll our own dialog.
Hidden warnings are stored in sessions.

The dialog is currently only used in the case where an included file
has a different textclass then the master (bug 3218).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29941 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-05 05:06:17 +00:00
Richard Heck
255b1e9d91 Word-wrapping for footnotes. Backports some earlier commits to trunk.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29920 a592a061-630c-0410-9148-cb99ea01b6c8
2009-06-04 13:04:51 +00:00
Jürgen Spitzmüller
647e492ac9 * InsetTabular.cpp (getStatus):
- allow again to set allocate multiple header attributes to a row,
	  since this is valid (fix bug 5950).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29722 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-18 06:25:43 +00:00
Jürgen Spitzmüller
9cd46c3d32 * InsetCollapsable.cpp (doDispatch):
- reset paragraph fonts also after LFUN_SELECTION_PASTE.
          This assures lang is set to latex in ERTs.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29691 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-16 15:43:06 +00:00
Vincent van Ravesteijn
35229a994e branch: Prevent assertions due to non-absolute filename as a parameter of buffer-switch or file-insert-plaintext.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29644 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-12 18:42:56 +00:00
Vincent van Ravesteijn
f4845784d5 branch: Fix bug #5890: Assertion when reducing the view size.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29606 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-10 10:55:17 +00:00
Enrico Forestieri
919f0537ff Fix bug 5705 by speeding up FileName operator== (Georg's solution).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29563 a592a061-630c-0410-9148-cb99ea01b6c8
2009-05-07 16:22:49 +00:00
Uwe Stöhr
93b6399c77 InsetHyperlink.cpp: - fix #5908 for branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29380 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-22 21:32:21 +00:00
Vincent van Ravesteijn
e1df748c11 branch: Fix bug 5894: Inserting tabs with inline selections.
see r29245.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29330 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-19 14:18:19 +00:00
Jürgen Spitzmüller
bb3e18b211 * InsetBranch.cpp:
- indicate branch status in the tooltip.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29198 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-11 07:17:41 +00:00
Richard Heck
ab34290690 Now, JMarc's check-cross branch patch for branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29194 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-10 21:59:03 +00:00
Richard Heck
d40a7651f2 Revert 29191. I didn't meant to commit all that.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29193 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-10 21:57:25 +00:00
Richard Heck
896f580ed0 Backport JMarc's check-cross patch for branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29191 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-10 21:51:50 +00:00
Richard Heck
132466f6f7 Backport fixes for 5787. Patches from Bo and Vincent.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29089 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-04 14:35:53 +00:00
Richard Heck
790376adbc Backport r28544, fixing 5751.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29086 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-04 14:06:08 +00:00
Jürgen Spitzmüller
9ee1ec0b62 backport r28934.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@29045 a592a061-630c-0410-9148-cb99ea01b6c8
2009-04-03 10:59:39 +00:00
Jürgen Spitzmüller
a26a9f6592 whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28937 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-27 12:39:17 +00:00
Richard Heck
1cf1e65b63 Tooltips for InsetCitation (backported).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28935 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-27 12:17:25 +00:00
Vincent van Ravesteijn
f72455413f branch: move ColorSet to a header of its own to reduce #include dependencies. Patch by Andre.
see:
http://www.lyx.org/trac/changeset/28426.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28841 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-17 13:23:54 +00:00
Jürgen Spitzmüller
3229618c20 * Fix encoding problem following a Listing (bug 5783).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28831 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-17 09:26:37 +00:00
Richard Heck
36e72cd094 Fix bug 5782 in branch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28824 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-16 20:19:51 +00:00
Richard Heck
a84580306e Backport r28340.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28820 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-16 19:31:12 +00:00
Richard Heck
a540263da9 Backport r28366-7, approved a long time ago and since held.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28809 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-15 21:26:14 +00:00
Vincent van Ravesteijn
73db05c0bb branch: Fix bug 1802: http://bugzilla.lyx.org/show_bug.cgi?id=1802.
* allows the selection of a whole cell with shift+key
* shift-movement between empty cells with a single keystroke 



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28779 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-14 17:31:11 +00:00
Vincent van Ravesteijn
06f2013ab8 branch: InsetTabular.cpp: Make sure the caption is inserted in the correct cell. This means we first have to reset the cursor to point to the new multicolumn, and then insert the caption.
See:
http://www.lyx.org/trac/changeset/28441

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28652 a592a061-630c-0410-9148-cb99ea01b6c8
2009-03-01 16:06:04 +00:00
Vincent van Ravesteijn
364cc24033 Fix nr.3 of bug 4346.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28643 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-28 16:52:46 +00:00
Vincent van Ravesteijn
5f63e5539e branch: Fix the fix for bug 4346: http://bugzilla.lyx.org/show_bug.cgi?id=4346.
Synchronizing insets asserts with two views open

This finishes the change of http://www.lyx.org/trac/changeset/28587.

Replace the setButtonLabels functions that need a BufferView by buttonLabel functions. These functions modify the label at drawing time.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28624 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-26 20:05:48 +00:00
Vincent van Ravesteijn
10dfb843e5 branch: Fix bug 5806: http://bugzilla.lyx.org/show_bug.cgi?id=5806.
Branch names with spaces impossible

Read the whole line to catch the whole branch name.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28623 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-26 19:43:01 +00:00
Vincent van Ravesteijn
2f695eb436 branch: Fix bug 5797: http://bugzilla.lyx.org/show_bug.cgi?id=5797.
GetStatus of an InsetCollapsable asserts for unhandled commands.

When you add a command to the context menu of an InsetCollapsable of which the getStatus method does not handle this command, an assertion will be raised. This happens when getStatus doesn't handle a command it is forwarded to text::getStatus which asserts because cur.text() is the text the inset is in, while this is the text of the inset. So, we only dispatch to text_ if the cursor is inside the text_. This is not the case for e.g. context menus.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28591 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-24 08:47:20 +00:00
Vincent van Ravesteijn
c17f118c9c Fix bug 4346: http://bugzilla.lyx.org/show_bug.cgi?id=4346.
Synchronizing insets asserts with two views open

It changes the autoOpen_ member of InsetCollapsable into a map, such that an autoOpen value can be specified for each bufferView. Now, the assertion is avoided and insetCollapsable can be open in one bufferview and be closed in the other in very special cases that the cursor end up in a closed inset.

Compare with the MathMacro::editing_ member. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28587 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-23 18:44:43 +00:00
Vincent van Ravesteijn
a9e9e03ce9 branch: Fix a crash when removing the label of an included Program Listing.
See also:
http://www.lyx.org/trac/changeset/28563

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28570 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-20 19:36:19 +00:00
Uwe Stöhr
13d6f8a0f7 InsetTabular.cpp: fix part of http://bugzilla.lyx.org/show_bug.cgi?id=5777 for branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28505 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-15 17:33:49 +00:00
Uwe Stöhr
bfa5b4bb49 InsetTabular.cpp: I removed this code accidentally in r28473 - this would have been a regression, therefore readding it.
(Sorry for all my mistakes in committing the last days.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28484 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-13 23:45:45 +00:00
Uwe Stöhr
ca42256a10 InsetTabular.cpp: I was over eager in r28443: there can only be one caption, but several header/footer rows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28475 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-13 03:17:05 +00:00
Uwe Stöhr
1248178b79 InsetTabular.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5772 and http://bugzilla.lyx.org/show_bug.cgi?id=5773 for branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28473 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-13 00:30:38 +00:00
Uwe Stöhr
b920bcd5a5 - InsetTabular.cpp: partly reverting r28441, because I was wrong: it is totally valid to have several rows to be the header and also several rows can have a caption, my own EmebeddedObjects manual has examples for this - stupid me!
Bug 5752 is nevertheless still fixed.

- status.16x: add entry

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28443 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-11 03:21:12 +00:00
Uwe Stöhr
0360ab7ff0 GuiTabular, InsetTabular: fix http://bugzilla.lyx.org/show_bug.cgi?id=5752
also for branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28441 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-11 01:31:17 +00:00
Vincent van Ravesteijn
8dac774bd5 branch: Fix bug 5753: http://bugzilla.lyx.org/show_bug.cgi?id=5753.
Crash when setting caption on a row with a multicolumn. 
If there is already a multicolumn on the row, the number of cells is different from column_info.size(). 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28436 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-10 17:52:52 +00:00
Vincent van Ravesteijn
396000e56f branch: Fix bug 5766: http://bugzilla.lyx.org/show_bug.cgi?id=5766.
Crash when selecting a row and doing "Delete column" in a table with multicolumns. 
The check "column + 1 < column_info.size()" checks whether there is at least one column after this one. However, this check is no longer valid if we remove the column from column_info first. 


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28434 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-10 17:44:10 +00:00
Vincent van Ravesteijn
ea02d9aac2 branch: Fix bug 5750: http://bugzilla.lyx.org/show_bug.cgi?id=5750.
Wrong width display of multicolumn cells.

When changing a custom width cell into a multicolumn, the isFixedWidth bool should be set to false. Now, the function setFixedWidth could only set isFixedWidth to true when needed.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28415 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 18:12:39 +00:00
Vincent van Ravesteijn
af485b4896 branch: Fix bug 5604: http://bugzilla.lyx.org/show_bug.cgi?id=5604.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28412 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-09 17:56:52 +00:00
Jürgen Spitzmüller
531bb4e207 Bug 5562: Fix command line output of subfigure insets by introducing new OutputParams and LaTeXFeatures members that tell the insets whether they are in a (sub)float.
Later, this can be replaces by a backpointer approach, as proposed at bugzilla (note that there are already similar cases such as InComment or InTableCell, so a backpointer approach would need to adapt the OutputParams methos anyway).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28383 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-07 12:28:04 +00:00
Pavel Sanda
2aad3a89c1 Backport
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28277 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-25 12:26:50 +00:00
Richard Heck
be42d0ed00 Partially revert r28128, which was causing problems. A better version
follows.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28214 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 15:53:31 +00:00
Vincent van Ravesteijn
90cb9cc852 branch: "Copy as Reference" in the context menu of a label.
New feature from Stefan. See also http://www.lyx.org/trac/changeset/27575.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28206 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 13:54:26 +00:00
Jürgen Spitzmüller
ca9723c2da * improve graphics group UI.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28199 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 08:06:04 +00:00
Uwe Stöhr
9158749b08 InsetHyperlink.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5686 for branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28196 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-17 05:29:58 +00:00
Richard Heck
54cd1dda02 Improve the rendering of BibTeX data in InsetCitation. This backports a handful
of commits from trunk.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28128 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-12 15:30:26 +00:00
Bo Peng
fd2a1fc368 Fix a LaTeX export error that prevents the inclusion of two program listings that differ only by file extension (bug 5681).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28101 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 19:53:48 +00:00
Jürgen Spitzmüller
07221b882b * LaTeXFeatures.cpp:
* InsetSpecialChar.cpp:
	- make the menu separator direction aware (in LaTeX output), bug 3560.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@28086 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-11 08:37:11 +00:00