Commit Graph

152 Commits

Author SHA1 Message Date
Richard Heck
72721655c5 Remove some indirection leftover from Andre's removal of controllers and such.
When we had GuiDocument and GuiDocumentDialog, there was a separation that required
this kind of thing, but now apply() is only ever called from applyView(), which is
private and only ever calls it with our local params.

This simplifies the forthcoming ProvidesModule, etc, patch a bit.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27000 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 21:00:33 +00:00
Richard Heck
afcc0e0490 Code duplication is bad.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26998 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 20:38:40 +00:00
Richard Heck
129df0bcd4 Make Abdel happy: Change case of local variables.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26997 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 20:31:33 +00:00
Richard Heck
ae339e3ca8 Remove now duplicated code.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26996 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 19:53:15 +00:00
Richard Heck
67dfff2d37 Update GuiDocument when there are changes to loaded modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26994 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-20 19:31:05 +00:00
Pavel Sanda
9d82588e3e Create new Module panel in document settings and decrease vertical
size of the dialog.

http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145035.html


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26953 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-19 01:21:59 +00:00
Richard Heck
5e505119fa OK, I lied. A little more. Just trying to keep the cleanup separate from
the real stuff.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26925 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 17:29:01 +00:00
Richard Heck
a940cc3f6b The last bit of cleanup: Make checking for exclusions a bit easier.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26924 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 17:21:13 +00:00
Richard Heck
28047741c2 Fix a bug involving module conflicts. We need to check not only that we
do not exclude some used module, but also that no used module excludes us.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26920 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 15:04:48 +00:00
Richard Heck
3e41704579 More cleanup prior to real patch.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26919 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-16 13:41:25 +00:00
Richard Heck
d4136cb652 Correct the order of the tests here. Messed this up in previous commit.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26906 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 18:06:08 +00:00
Richard Heck
6a5a7d7e20 The last little bit of comment, etc, cleanup here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26905 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 17:35:49 +00:00
Richard Heck
b73d5450b7 More cleanup for forthcoming patch. Also fix a copy-paste error.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26904 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 17:14:25 +00:00
Richard Heck
9c95358b85 Check for changes to modules before switching text classes. See the removed
FIXME for more.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26903 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 17:03:57 +00:00
Richard Heck
c83ae83ebf Remove unnecessary argument to paramsToDialog(). This is again
cleanup prior to a forthcoming patch.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26902 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 16:59:28 +00:00
Richard Heck
a707ac75ac Change some vectors to lists. This is preparatory for a real patch later.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26899 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 14:04:21 +00:00
Richard Heck
a34c0a8742 Just whitespace.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26895 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-14 12:49:05 +00:00
Pavel Sanda
308e2d9df3 Sanitize backreferences in hyperref.
http://bugzilla.lyx.org/show_bug.cgi?id=5340
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144958.html



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26882 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-13 16:01:02 +00:00
Richard Heck
de01bc54ff All comments and formatting.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26876 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 22:21:56 +00:00
Richard Heck
50e5a3b796 Remove old and out of date comment.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26875 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 22:07:47 +00:00
Richard Heck
9c2fa02d4a Add a comment, per Pavel's suggestion.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26874 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 22:02:31 +00:00
Richard Heck
a9226314d1 Don't access this directly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26867 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 15:34:08 +00:00
Richard Heck
4ececaf03d Update the modules after we make the document class. This will ensure
that we get any new default modules on board.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26866 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 15:29:54 +00:00
Jürgen Spitzmüller
d45ca67d1d ** fix bug 2114. Fileformat change.
** fix bug 5343 (patch from Richard, prerequisite for the other fix)

* Buffer.cpp:
	- increment format to 343
* src/BufferParams.{cpp,h}:
	- new param \use_default_options that allows to select/deselect
	  the "Other" class options defined in the layout file.
* src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/LaTeXUi.ui:
	- add GUI to set \use_default_options, display predefined options in the dialog
	- update dialog correctly on class change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26860 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-12 09:36:00 +00:00
Richard Heck
2078e09e67 The default modules should be kept in order.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26801 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-07 15:53:05 +00:00
Uwe Stöhr
ce09194e43 GuiDocument.cpp, BufferParams.cpp: fix http://bugzilla.lyx.org/show_bug.cgi?id=5294
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26628 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-29 19:33:37 +00:00
Abdelrazak Younes
53acfb8351 Dialogs: discourage non const access to buffer() and bufferview().
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26620 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-29 10:52:17 +00:00
André Pönitz
e5ae1a4b75 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26481 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-21 19:27:20 +00:00
André Pönitz
fc86915b0c cosmetics. remoe strange dependency of GuiDocument.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26467 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-20 13:44:51 +00:00
André Pönitz
0f6b4e902f save a few cycles
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26466 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-20 12:57:12 +00:00
André Pönitz
e7812d3e26 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26465 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-20 12:17:15 +00:00
André Pönitz
739f890e74 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26464 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-20 12:07:18 +00:00
André Pönitz
ae62ef20f8 cosmetics;
also use QT_NO_CAST_TO_ASCII and QT_NO_STL for better checks on type
conversions


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26463 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-20 11:47:38 +00:00
Pavel Sanda
c1173eb11c Coding style
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26335 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-08 01:18:33 +00:00
Jürgen Spitzmüller
2179c671cf better naming for encoding default, as discussed in bug 4971.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26281 a592a061-630c-0410-9148-cb99ea01b6c8
2008-09-01 08:39:19 +00:00
Uwe Stöhr
1b03dfa0b5 GuiDocument.cpp: revert r26041
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26046 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-04 00:04:09 +00:00
Uwe Stöhr
78bb4feba1 GuiDocument.cpp: fix two cases of bug 5112
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26041 a592a061-630c-0410-9148-cb99ea01b6c8
2008-08-03 21:31:25 +00:00
Richard Heck
163d827729 Support for removing "default" modules.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25917 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-27 17:46:27 +00:00
Richard Heck
a28c584064 Move the default module loading from makeDocumentClass() to setBaseClass().
This makes the Document>Settings dialog behave better.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25882 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-25 16:48:48 +00:00
Jürgen Spitzmüller
dcc4d58b66 *** Implement GUI names for encodings (part of bug 4971) ***
* lib/encodings:
	- add new column "GUI names"

* src/Encoding.{cpp,h}:
	- read in and handle GUI names

* src/frontends/qt4/GuiDocument.cpp:
	- display GUI names instead of LaTeX names

* po/lyx_pot.py:
* po/Rules-lyx:
* development/scons/SConstruct:
	- add encoding GUI names to the po files.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25558 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-11 08:56:17 +00:00
Bo Peng
763ef015ce Improve the local layout feature by better handling of unknown textclass, unknown layouts, and switch between textclasses.
* src/TextClass.h[.cpp]: add addLayoutIfNeeded() and createDefaultLayout()
	* src/Layout.h[.cpp]: add unknown_ to mark if a layout is a default layout for an unknown one.
	* src/LayoutFile.cpp: add addDefaultClass and change addLayoutFile to addLocalLayout.
	* src/Text.cpp: add unknown layouts that are not recognizable by a new textclass.
	* src/frontends/qt4/GuiToolbar.cpp: display (unknown) for unknown layouts.
	* src/frontends/qt4/GuiDocument.cpp: restore 'browse layout' button.
	* src/frontends/qt4/ui/LaTeXUi.ui: restore 'browse layout' button.
	* src/CutAndPaste.cpp: do not convert unknown layouts from pasted text
	* src/BufferParams.cpp: add a default textclass when a document with unknown textclass is loaded.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25555 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-11 02:43:02 +00:00
Jürgen Spitzmüller
2c5d1e9ebe * src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/LaTeXUi.ui:
	- hide the "browse local layout" button as discussed on
	  http://bugzilla.lyx.org/show_bug.cgi?id=4812
	  because the local layout feature can result in dataloss.

	  Whether the feature itself should be removed for 1.6.0 has
	  to be discussed.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25452 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-05 08:54:48 +00:00
Jürgen Spitzmüller
15676a062f proper fix for bug 4936.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25215 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-09 15:20:38 +00:00
Jürgen Spitzmüller
3b00c86b9d brute fix weird bug 4936.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25203 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-09 10:41:58 +00:00
Jürgen Spitzmüller
d7eaaba900 ** support for CJK font argument. File Format change **
* src/BufferParams.{cpp,h}:
	- new param fontsCJK (font_cjk).

* src/output_latex.cpp:
	- use fontsCJK param.

* src/Buffer.cpp:
	- increase file format

* src/frontends/qt4/GuiDocument.cpp:
* src/frontends/qt4/ui/FontUi.ui:
	- GUI for the CJK font param

* lib/lyx2lyx/lyx_1_6.py:
	- remove font_cjk param on reversion.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25135 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 06:18:34 +00:00
Abdelrazak Younes
3dc6a5f43c rework a bit the document dialog so that it works more or less fine without any open document.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24783 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-15 08:41:17 +00:00
Abdelrazak Younes
09a3be216e Hopefully fix locale aware language sorting in document and prefs dialogs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24758 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-14 10:34:19 +00:00
Stefan Schimanski
e0edc21111 * no .h for Qt headers
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24687 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-08 15:08:46 +00:00
Stefan Schimanski
419c7ed481 * For gcc to know about QStandardItemModel < QAbstractItemModel we need this header.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24686 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-08 14:40:01 +00:00
Abdelrazak Younes
59124528ac use GuiApplication::languageModel() in GuiDocument.cpp
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24680 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-08 09:18:45 +00:00