2009-11-07 10:44:08 +00:00
|
|
|
#\DeclareLyXModule{Theorems (Numbered by Section)}
|
2008-01-10 04:58:20 +00:00
|
|
|
#DescriptionBegin
|
2009-11-07 10:44:08 +00:00
|
|
|
#Numbers theorems and the like by section (i.e., the counter is reset at
|
|
|
|
|
#each section start).
|
2008-01-10 04:58:20 +00:00
|
|
|
#DescriptionEnd
|
This commit changes the way individual LyXModule's are represented, both internally and in the .lyx files. The earlier version represented them by their `descriptive name', e.g., "Endnote" or "Theorems (AMS)", these being the same names used in the UI. This was a mistake, as becomes readily apparent when one starts to think about translating these strings. The modules ought to be represented by their filename, without the extension, just as TextClass's are.
The changes that accomplish this part are in ModuleList.{h,cpp}, configure.py, and the *.module files themselves. This is a format change, and the lyx2lyx is in those files.
By itself, that change would not be major, except for the fact that we do not want the module to be represented in the UI by its filename---e.g., theorems-std---but rather by a descriptive name, such as "Theorems". But that change turns out to be wholly non-trivial. The mechanism for choosing modules was the same as---indeed, was borrowed from---that in GuiCitation: You get a list of modules, and choosing them involves moving strings from one QListView to another. The models underlying these views are just QStringListModels, which means that, when you want to know what modules have been selected, you see what strings are in the "selected" QListView. But these are just the descriptive names, and we can't look up a module by its descriptive name if it's been translated. That, indeed, was the whole point of the change to the new representation.
So, we need a more complicated model underlying the QListView, one that will pair an identifying string---the filename minus the extension, in this case---with each item. This turns out not to be terribly difficult, though it took rather a while for me to understand why it's not difficult. There are two parts:
(i) GuiSelectionManger gets re-written to use any QAbstractListModel, not just a QStringListModel. This actually seems to improve the code, independently.
(ii) We then subclass QAbstractListModel to get the associated ID string, using the Qt::UserRole slot associated with each item to store its ID. This would be almost completely trivial if QAbstractListItem::itemData() included the QVariant associated with this role, but it doesn't, so there are some additional hoops through which to jump.
The new model, a GuiIdListModel, is defined in the files by that name. The changes in GuiSelectionManger.{h,cpp} make it more abstract; the changes in GuiDocument.{h,cpp} adapt it to the new framework.
I've also updated the module documenation to accord with this change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22501 a592a061-630c-0410-9148-cb99ea01b6c8
2008-01-12 04:28:12 +00:00
|
|
|
#Requires: theorems-std | theorems-ams
|
2008-10-20 21:09:11 +00:00
|
|
|
#Excludes: theorems-chap
|
2009-08-14 15:20:11 +00:00
|
|
|
#Category: theorems
|
2008-01-10 04:58:20 +00:00
|
|
|
|
|
|
|
|
# Author: Richard Heck <rgheck@comcast.net>
|
|
|
|
|
|
2010-03-29 18:51:41 +00:00
|
|
|
Format 26
|
2008-01-10 04:58:20 +00:00
|
|
|
|
2008-10-06 14:58:22 +00:00
|
|
|
Counter theorem
|
2008-01-10 04:58:20 +00:00
|
|
|
Within section
|
|
|
|
|
End
|
|
|
|
|
|
|
|
|
|
Style Theorem
|
|
|
|
|
Preamble
|
2009-08-07 19:06:12 +00:00
|
|
|
\theoremstyle{plain}
|
2009-02-17 20:25:56 +00:00
|
|
|
\newtheorem{thm}{\protect\theoremname}[section]
|
2008-01-10 04:58:20 +00:00
|
|
|
EndPreamble
|
2009-02-17 20:25:56 +00:00
|
|
|
LangPreamble
|
|
|
|
|
\providecommand{\theoremname}{_(Theorem)}
|
|
|
|
|
EndLangPreamble
|
|
|
|
|
BabelPreamble
|
|
|
|
|
\addto\captions$$lang{\renewcommand{\theoremname}{_(Theorem)}}
|
|
|
|
|
EndBabelPreamble
|
2008-01-10 04:58:20 +00:00
|
|
|
End
|
