Commit Graph

112 Commits

Author SHA1 Message Date
Richard Heck
741bd1221a Fix for bug 5053. There are still some serious problems here, though, as (a) "unknown" cannot be translated and (b) the way the code was re-written, it will fail if unknown and translated layout names are used. This is because it completely subverts the use of a multicolumn model. I'll try to fix that, too.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25670 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-16 15:29:00 +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
Richard Heck
780bce0f96 Rename empty layout stuff to plain layout stuff.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25541 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-10 17:41:52 +00:00
Jean-Marc Lasgouttes
71860fbc86 suppress warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25374 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-24 09:52:43 +00:00
Abdelrazak Younes
312bb47dd5 Some more fixes to icon size and session settings.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25317 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-19 07:40:29 +00:00
Abdelrazak Younes
1009aed25a fix http://bugzilla.lyx.org/show_bug.cgi?id=4957
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25316 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-19 06:21:04 +00:00
Abdelrazak Younes
cf466ab567 Mac compil fixes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25143 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 14:40:41 +00:00
Abdelrazak Younes
b1002fc32c Provide a generic way to retrieve icons from the frontend.
* Application: new iconName() pure virtual interface.

* GuiApplication: transfer icon searching code from GuiToolbar.cpp.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25139 a592a061-630c-0410-9148-cb99ea01b6c8
2008-06-05 08:31:22 +00:00
Abdelrazak Younes
5254716219 GuiToolbar::fill(): only once.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24978 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-28 10:30:25 +00:00
Abdelrazak Younes
15b42ccd4a startup optimisation: delay toolbar filling until it is shown on screen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24977 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-28 10:26:03 +00:00
Abdelrazak Younes
7bb8a5f183 Re-engineer the toolbar support code:
- We now rely more upon Qt features,
- the initial toolbar positioning defined in "lib/ui/default.ui" is now only used if there is no session or if session handling is disabled,
- The session saving/restoring is window dependent.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24954 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-27 11:15:17 +00:00
Abdelrazak Younes
033c3df44c a bunch of toolbar related renaming.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24931 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-25 08:30:06 +00:00
Stefan Schimanski
7fc89d34da * compare locale aware
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24688 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-09 01:16:49 +00:00
Jean-Marc Lasgouttes
9b4a26a252 rename assert.h to lassert.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24559 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-30 08:26:40 +00:00
André Pönitz
a657380659 cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24397 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-20 21:05:35 +00:00
André Pönitz
7f461f4392 infrastructure for 'graceful asserts'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24216 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-10 21:49:34 +00:00
Jürgen Spitzmüller
e624a4176e * GuiToolbar.cpp (sorted_ong_map):
- sort (and prevent assertion).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24177 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-08 15:59:23 +00:00
Edwin Leuven
24130fa0c2 resuscitate Vert.png as vert2.png
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24175 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-08 14:57:06 +00:00
Richard Heck
7d57b49746 Minor cleanup.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23930 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-24 18:56:12 +00:00
Jean-Marc Lasgouttes
ad00d81144 use consistent ifdefs for the mac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23788 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 10:23:02 +00:00
Richard Heck
c17a8122cf Cosmetics.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23780 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-17 01:10:45 +00:00
Stefan Schimanski
6f26243e13 * only for Mac
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23728 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-14 23:07:40 +00:00
Stefan Schimanski
dd9a03b910 * copy icon size to new GuiView from the last GuiView
* use small Mac combobox widget for small icon size. Otherwise the combobox is bigger than the icons.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23720 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-14 16:39:34 +00:00
Stefan Schimanski
5d112c185c * remove the need of an active GuiView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23718 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-14 16:33:16 +00:00
Jean-Marc Lasgouttes
72c26ac6d1 two uninitialized variables uncovered by valgrind, and a gcc warning
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23707 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-13 10:28:02 +00:00
Stefan Schimanski
bde87d4ce7 * recover the status bar by only showing the layout list hints when the layout list is visible.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23683 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-12 14:07:53 +00:00
Stefan Schimanski
c81e3a0203 * use base color for layout list background. Qt docs say:
QPalette::Base:	Used mostly as the background color for text
entry widgets, but can also be used for other painting - such as the
background of combobox drop down lists and toolbar handles. It is
usually white or another light color.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23660 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-11 10:29:14 +00:00
Stefan Schimanski
361d4d9a16 * simplified layout list a lot by subclassing QItemDelegate instead of
trying to simulate a menu with a QListView (that's what QComboBox does
on some platforms, but not on all).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23654 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 23:00:53 +00:00
Stefan Schimanski
e627e6fb53 * remove style, left from debugging
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23646 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 18:44:28 +00:00
Stefan Schimanski
c6fff07103 * patch by Pavel to make the layout list look like it used to be in 1.5.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23644 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 17:11:14 +00:00
Stefan Schimanski
3be96448d5 * use small font for the header metrics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23640 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 15:43:47 +00:00
Stefan Schimanski
3e8e012355 * compile fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23639 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 15:42:35 +00:00
Stefan Schimanski
06a5803eab * reduce spacing in layout list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23638 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 15:41:30 +00:00
Stefan Schimanski
edf9667025 * center RTF text vertically correctly in layout list
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23635 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 14:44:40 +00:00
Stefan Schimanski
feb96b01aa * draw full line for empty categories
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23627 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 13:10:10 +00:00
Stefan Schimanski
473091fb82 * center the line in the layout category headers in the middle of the lowercase chars
* some messages for the statusbar
    * configuration option for grouping of the layouts
    * put category headers above the first item of each category in the
      layout list.
      To avoid scrolling we have to sneak in space for the headers.
      So we tweak this value accordingly. It's not nice, but the
      only possible way it seems.

    Note 1: Because QComboBox uses the "first row's height * rowCount" to
    estimate the height of the popup, we have to fake some extra pixel
    lines to avoid scrolling because of the extra space taken by the
    headers. This is a hack, but I don't see a better way to establish that.

    Note 2: An alternative implementation is to insert headers as real list
    items. But it seems that QListView cannot skip them in cursor
    navigation then. So we stick to the upper approach.

    * remove checkbox in layout menu


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23626 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-10 13:02:57 +00:00
André Pönitz
be624b3de0 less string conversions as long as we stay in the frontend
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23552 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-08 07:59:47 +00:00
Richard Heck
a01cb111a0 Change the interface to a paragraph's layout. We still store a LayoutPtr, but now privately, and make a Layout const & available to clients.
The need for a LayoutPtr arises from the fact that (a) we do not want to give our clients a Layout &, since we do not want them to be able to change our Layout; but (b) we also need to be able to change which layout is ours. So we cannot store a Layout const &. Or so it seems to the compiler.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23522 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 21:31:27 +00:00
Richard Heck
f401ce5d29 Changes LayoutList from a vector<LayoutPtr> to a vector<Layout>.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23519 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 20:01:30 +00:00
Richard Heck
592f951ba0 Kill indexing into the list of layouts.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23505 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 05:59:21 +00:00
Richard Heck
ac89b178de Simplify the logic a bit here.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23504 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-06 05:10:04 +00:00
Uwe Stöhr
32a3ce2546 GuiToolbar.cpp: compile fixes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23492 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 22:41:56 +00:00
Stefan Schimanski
e636df4610 * preparation for the layout categories. Now the separator is just
drawn above the "-- Separator --" line. As soon as the category
  information is available the same code will draw the separator at
  every category change in the list.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23489 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 20:43:55 +00:00
Stefan Schimanski
cdf8979160 * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23485 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 19:00:26 +00:00
Stefan Schimanski
bf96153185 * is.at is const, is[] is a deep non-const copy
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23484 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 19:00:11 +00:00
Stefan Schimanski
107faacf0e * clear filter when showing popup of layout list
* show filter hint in status bar


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23481 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 16:02:18 +00:00
Stefan Schimanski
791b82457d * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23479 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 13:07:01 +00:00
Stefan Schimanski
00bcfe78bd * adjust layout list size to contents
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23478 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 12:26:50 +00:00
Stefan Schimanski
d749ce138d * cosmetic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23477 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 12:04:46 +00:00
Stefan Schimanski
cafaf075e5 * even when sorted alphabetically keep the separation of standard and module layouts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23476 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-05 12:02:18 +00:00