anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 10:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
25,653 Commits 31 Branches 172 Tags 618 MiB
892bc7dac3
Commit Graph

6978 Commits

Author SHA1 Message Date
Richard Heck
346f3aa503 Clean up this code a little bit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35540 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-29 13:14:20 +00:00
Richard Heck
5a46224f73 Remove the magic boolean in getChildren() from the public interface. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35538 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-29 13:05:57 +00:00
Richard Heck
d07c00032a Simplify some of the find and replace code now, since allRelatives() is 
stable and always has the root document at the beginning.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35535 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-29 12:50:24 +00:00
Richard Heck
2f1af8892b I prefer this style.... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35533 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-29 12:19:57 +00:00
Richard Heck
7ff1a60d12 Introduce Buffer::hasChildren() and use it. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35531 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-29 12:17:24 +00:00
Richard Heck
2291614a6c Introduce a typedef for vector<Buffer *>. No change in behavior 
anticipated.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35529 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-29 11:55:10 +00:00
Stephan Witt
1a681aaf24 #6917 move forward after adding a word to personal dictionary or the list of ignored words 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35525 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-28 15:09:06 +00:00
Uwe Stöhr
9fa49ecafa GuiPainter.cpp: correct attempt from r35491 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35498 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-25 14:14:50 +00:00
Edwin Leuven
ad12fa6eb5 correct icon size in math panels 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35492 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-24 12:59:43 +00:00
Pavel Sanda
b1b1e13ad4 My compilator issues warning. Uwe, please check that this was intended. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35491 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-24 12:26:28 +00:00
Uwe Stöhr
3c9928285a LineUi.ui: Qt's designer use XML as default - revert this from previous commit 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35489 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-24 04:29:07 +00:00
Uwe Stöhr
1557a6f2f9 LineUi.ui: a line has a thickness rather then a height 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35487 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-24 04:26:13 +00:00
Uwe Stöhr
7aac2c0502 GuiMathMatrix: 
- decorated matrices can have horizontal alignment
- remove unused void

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35485 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-24 03:44:34 +00:00
Pavel Sanda
59ce20acde Add CB for Meta/Control key swap on Mac OS X. 
Patch by Jens Noeckel.
http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg160177.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35453 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-19 22:00:25 +00:00
Uwe Stöhr
5a7328b0bb GuiDocument.cpp: the local layout can be treated as layout file snippet like a module - therefore group it with the module panel in the document settings dialog 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35421 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-17 01:46:45 +00:00
Uwe Stöhr
6faa1b3713 GuiLine: honor Abdel as author 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35420 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-17 01:32:23 +00:00
Stephan Witt
dec437fbac add cache of spell checker results to speed up native speller engine on macosx 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35362 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-14 05:24:04 +00:00
Uwe Stöhr
cfe3bdbe30 GuiLine.cpp: set default values 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35343 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-11 16:19:24 +00:00
Abdelrazak Younes
379eba512b InsetParamsDialog: set focus to InsetParamsWidget. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35341 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-11 08:01:08 +00:00
Abdelrazak Younes
71a350923a GuiLine: 
* Add default values: please someone put something sensible here.
* Remove text manipulation for negative values and add a FIXME.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35340 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-11 07:52:06 +00:00
Jean-Marc Lasgouttes
24fcbd6f0c Set url color from system theme. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35333 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-09 13:04:02 +00:00
Pavel Sanda
74b9ebf531 Turn on sliding when starting comparison 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35327 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-08 15:12:55 +00:00
Pavel Sanda
22434db502 Switch on CT in comparison result 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35326 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-08 15:09:10 +00:00
Pavel Sanda
59a2c46ae9 Fix part of #6880 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35325 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 19:26:01 +00:00
Pavel Sanda
309caac963 Fix whitespace bug reported by Bennett 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35324 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 19:03:28 +00:00
Pavel Sanda
b3f7326cfe Another glitch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35321 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 16:05:12 +00:00
Abdelrazak Younes
18b52e7bc5 Migrate GuiLine to InsetParamsWidget. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35320 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 14:13:28 +00:00
Abdelrazak Younes
b4b1357b02 whitespace 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35319 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 14:11:28 +00:00
Pavel Sanda
db1f90a7f8 Ui glitches 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35313 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:58:42 +00:00
Pavel Sanda
8f457065c5 Better debugging 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35311 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:29:11 +00:00
Pavel Sanda
8ae629fd68 Revisions starts from 1 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35310 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:29:09 +00:00
Pavel Sanda
e1a98bc7d3 RCS has different revision numbering 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35309 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:29:07 +00:00
Pavel Sanda
b2512f44d6 These things need to be updated for each dialog opening 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35308 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:29:05 +00:00
Pavel Sanda
c14dad8d2b Finish VC_COMPARE, connect to compare dialog and run it automatically. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35307 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:29:02 +00:00
Pavel Sanda
e2c0424c17 Add decent UI for VC_COMPARE 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35306 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 11:28:57 +00:00
Peter Kümmel
85d87c0a46 use one place to adjust width of thin lines 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35302 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 05:14:57 +00:00
Uwe Stöhr
0e7ab29f49 InsetLine: support for the LaTeX command \rule; kick out the hardcoded \lyxline; fileformat change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35299 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-07 00:41:00 +00:00
Jean-Marc Lasgouttes
58c9d2ed61 When the non-system background is used, let it be editable too. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35297 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 13:02:18 +00:00
Jean-Marc Lasgouttes
4f45a35918 Do not overwrite background color with system background color if this color is white 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35295 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 10:26:58 +00:00
Stephan Witt
ed4ae48e85 correct short-cut conflict 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35291 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-06 06:53:14 +00:00
Uwe Stöhr
f01e36b646 painter: make it possible to draw lines with custom line thicknesses 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35283 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-05 14:46:58 +00:00
Uwe Stöhr
0d54d0e79e GuiPrintNomencl.cpp: remove unused include 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35281 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-04 14:54:13 +00:00
Richard Heck
a5cb539d08 Don't say empty layouts are valid. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35272 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-03 13:33:05 +00:00
Pavel Sanda
46ce4588df Squash Qt warning 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35270 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-09-03 11:21:15 +00:00
Uwe Stöhr
a2c6c06908 better support for the mathdots package: 
technically this package is the same as esint, only for dots instead of integrals -> therefore we can and should handle it the same as esint

-> add "use automatically" checkbox
-> load mathdots if \iddots is inserted

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35251 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-31 23:34:54 +00:00
Uwe Stöhr
1712e4f35e support to load the mathdots package via the document settings; fixes #5373; fileformat change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35241 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-31 02:04:46 +00:00
Jürgen Spitzmüller
0ac0b1a81d fix cutnpaste error. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35196 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-25 06:37:37 +00:00
Jürgen Spitzmüller
3ca7e00058 * GuiTabular.{cpp,h}: 
- reimplement funcEnabled.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35195 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-25 06:25:07 +00:00
Uwe Stöhr
d0f8cf1018 GuiTabular.cpp: fix another FIXME 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35193 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-25 02:56:27 +00:00
Uwe Stöhr
db6634578d GuiTabular.cpp: fix #6859 and a FIXME 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35192 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-25 02:36:02 +00:00
Uwe Stöhr
7d68833dc9 remove unused include of FuncRequest 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35189 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-24 03:07:09 +00:00
Uwe Stöhr
38ed6cd1a0 \lyxline is a LyX-specific macro that creates a line in the output 
- this line is defined with a width of 1pt -> therefore also draw it in this size in lyx
- this line is by default black -> use black
- setting a color for this in the preferences is wrong and senseless, because the color of this line is defined by the color chosen in the text style dialog -> remove preference color

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35185 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-24 01:13:26 +00:00
Jürgen Spitzmüller
cf0708db7a * TabularUI.ui: 
- add accelerator
	- better labeling

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35155 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-14 17:13:57 +00:00
Jürgen Spitzmüller
24dc465cc0 Add some accelerators. 
NOTE: some new elements in the dialogs still lack accelerators. People, please think of keyboard users when adding UI!

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35154 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-14 17:08:57 +00:00
Jürgen Spitzmüller
0a7b799510 * Output.ui: clearer labeling 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35151 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-14 15:27:05 +00:00
Jürgen Spitzmüller
bd19edccf0 * GuiPrefs.cpp: casing fixes. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35150 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-14 15:19:05 +00:00
Jürgen Spitzmüller
188c57aeda * GuiTabular.cpp: 
- fix enabling of decimal separator item by using proper gui/data separation
	- better labeling

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35149 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-14 15:10:53 +00:00
Jean-Marc Lasgouttes
60445ede53 remove unused headers 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35129 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-12 09:38:22 +00:00
Jean-Marc Lasgouttes
b01fcee92d Finish implementation of "use system colors" checkbox. 
ColorCache: 
  * method isSystem() allows to know whether a color can be overridden by system colors
  * method get() has a variant that accepts a bool (system color or not)
  * code simplifications
GuiPrefs:
  * hide colors set from the system when they are inherited
  * syncronize list of colors and checkbox


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35101 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-09 12:15:02 +00:00
Jean-Marc Lasgouttes
17729b9346 Add new pref use_system_colors (defaults to true). 
What is missing is some feedback on what colors are 
set from the system (they should be disabled in the
color list).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35096 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-08 23:11:02 +00:00
Jean-Marc Lasgouttes
088059724d Remove DPI from preference dialog. The variable is kept in 
LyXRC, since we do need the value in the code. If this is
a problem, I can define some QApplication::getDPI() and give
up configurability altogether.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35095 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-08 20:32:26 +00:00
Jürgen Spitzmüller
a84925bebe * GuiPrefs.cpp: 
- do not allow to change a format's short name if the format is used by a converter (fixes crash issue #6815).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35079 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-07 11:31:28 +00:00
Jean-Marc Lasgouttes
d10b46ffbd set more colors from qt palette 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35077 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-07 10:48:32 +00:00
Jean-Marc Lasgouttes
c2dfd50705 Fix default colors for workarea. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35074 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-07 09:21:44 +00:00
Richard Heck
3d050130a2 Forgot this file. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35062 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-06 11:30:18 +00:00
Richard Heck
64f979cb06 A UI for document-local layout information. LyX has supported this for a 
while, but without any UI for it. (There has been local layout in the
Customization manual for a long time, in fact.)

Yes, this is an advanced feature. But, absent a layout editor, it is the
one thing that will make it easier, and possible, for "normal users" to
experiment with layout without having to go through reconfiguration,
etc, etc. To keep too many people from shooting themselves, we validate
the layout information before allowing the user to apply it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35061 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-05 22:47:42 +00:00
Jean-Marc Lasgouttes
e1fa4c9eb3 Initialize some LyX colors from Qt. Currently what is done is plain text and selection (both font and background). 
I am not sure that there is something else that we can get from QPalette. Maybe
cursor color, if someone tells me how to get it.

Only tested on mac. I can revert if this causes problems on linux or windows.

I have to check too that it still works in non-gui mode.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35060 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-05 22:41:34 +00:00
Jean-Marc Lasgouttes
e4f2484cb5 Implement LFUN_SPELLING_REMOVE (patch from switt) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35055 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-05 20:10:40 +00:00
Richard Heck
b2b811fcd7 Remove \Nameref entry. Forgotten before.... 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35050 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-05 02:17:07 +00:00
Jürgen Spitzmüller
15f9312d80 * GuiLog.cpp: refine warning detection: 
- detect "LaTeX Font Warning"
	- detect "Class X Warning"
	- package warnings can contain dots ("Package pdftex.def Warning")

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35040 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-08-02 16:38:41 +00:00
Stephan Witt
710bb42049 correct typo in RC_SCROLL_WHEEL_ZOOM text 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@35004 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-22 14:51:35 +00:00
Peter Kümmel
815ec52ab8 merged build: macro name has changed 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34981 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 21:23:26 +00:00
Stephan Witt
0498aa1dcb correct OR when checking modifiers 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34974 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 12:18:22 +00:00
Richard Heck
7441f370c0 Revert r34969. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34973 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 12:09:06 +00:00
Uwe Stöhr
ab85e493c7 GuiWorkArea.cpp: make it compilable 
Stephan, please check if this is correct

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34969 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 11:49:34 +00:00
Stephan Witt
e99bd868f9 use "alt" instead of "option" for modifier keyword 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34967 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-18 10:04:59 +00:00
Stephan Witt
0d386d7c25 make mouse scroll wheel zoom configurable 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34955 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 22:29:42 +00:00
Uwe Stöhr
d8523cc229 GuiFontLoader.cpp: forgot this in r34941 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34944 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 16:16:47 +00:00
Peter Kümmel
c09d33120d UNDO: enc 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34943 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 16:09:26 +00:00
Uwe Stöhr
72292b98a6 support for formal math script 
- fileformat change
- fixes #2340

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34941 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 15:51:11 +00:00
Peter Kümmel
56a7a67783 add first version of .lyx file encryption. It's disabled by default and could out-of-the-box only by compiled on Linux with cmake and with openssl-devel packeges. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34931 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-17 12:26:11 +00:00
Richard Heck
17166837d7 Revert last commit. I was confusing two things. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34890 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-13 14:13:47 +00:00
Richard Heck
e611cc2d4a Enhance LyX by fixing #6760. New preference to set minimum length of 
automatically spellchecked words.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34889 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-13 14:08:44 +00:00
Richard Heck
47db764ccc Nameref support. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34884 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-13 03:23:29 +00:00
Uwe Stöhr
e2e63b4b1b support for the ISO C-series paper formats; fileformat change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34883 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-13 01:06:20 +00:00
Vincent van Ravesteijn
9be7c2a0ec Fix unnecessary dependencies on GuiDocument.h. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34882 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-12 21:42:25 +00:00
Richard Heck
530b1faad9 Make this translatable. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34880 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-12 17:40:54 +00:00
Stephan Witt
7b34b13b71 avoid LYX_PLATFORM_DARWIN10 macro 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34861 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-11 21:30:47 +00:00
Richard Heck
5577e877bb Try to move all updateBuffer() calls to a central location. We now use 
DispatchResult to store a flag that tells us whether we need a buffer
update or not. 

So: If you find a missing one, go to an appropriate place in the
dispatch and call cur.forceBufferUpdate() or, if you don't have a cursor
but do have a DispatchResult, call dr.forceBufferUpdate().

There is one remaining call I could not move, in
TextMetrics::redoParagraph. But this looks like an emergency call when
the macro context has not been set. There are also a couple calls that
are connected with buffer creation that I commented out, since the same
call is done again almost immediately. But I'm not positive about those.

Now the nice thing would be to do the same for updateMacros().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34826 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-09 14:37:00 +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
Richard Heck
c0cc803e55 Warning. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34815 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-08 20:01:17 +00:00
Stephan Witt
f4aedbe672 correct ifdef+defined construct 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34813 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-08 10:39:24 +00:00
Stephan Witt
7276f04fa1 provide native spell checker for Mac OS X 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34812 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-08 07:56:29 +00:00
Uwe Stöhr
76ad72221c ColorUi.ui: remove unnecessary window title 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34796 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-07 00:43:47 +00:00
Vincent van Ravesteijn
1541a7f756 GuiBox.cpp: Remove some unnecessary negated logic. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34780 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-06 12:01:09 +00:00
Uwe Stöhr
ebcef496a5 - new support for makebox; fileformat change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34748 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-07-03 13:14:15 +00:00
Jean-Marc Lasgouttes
50117dc8ea fix scroll wheel on mac (bug #6775) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34731 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-30 12:38:39 +00:00
Peter Kümmel
615d42d357 TR1: use std::tr1 regex with msvc10 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34725 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-29 17:09:40 +00:00
Uwe Stöhr
7d031e1fef GuiBox.cpp: fix this issue: horizontal box alignment is only possible without inner box and simple frame (the same as with pagebreaks) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34713 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-26 21:02:14 +00:00
Jürgen Spitzmüller
3e2ca552af * GuiBoc.{cpp,h}: 
- compare against combo box data instead of l7n string.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34709 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-26 07:57:54 +00:00
Jürgen Spitzmüller
ecfe108cde * GuiBoc.{cpp,h}: 
- use proper combo box data instead of the current int mumbo jumbo.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34708 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-25 17:39:53 +00:00
Jürgen Spitzmüller
807d618a96 GuiSpellchecker.cpp: typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34704 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-25 14:06:12 +00:00
Vincent van Ravesteijn
fb99c8115a Fix the enabling/disabling of the custom latex font encoding lineedit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34694 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-25 03:33:15 +00:00
Vincent van Ravesteijn
f616126668 Remove the boldness of the XHTML Output Options string in GuiDocument. We nowhere use bold headers. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34693 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-25 03:32:08 +00:00
Vincent van Ravesteijn
f27ccb580b Better fix for bug #5942: proper multi-window usage is restored again. Now, LyX only switches to a buffer in a different view if open in tabs is disabled and there is already a document open in the current view and the buffer is already opened in another view. 
see r34618.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34684 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-17 21:18:08 +00:00
Vincent van Ravesteijn
41cd987dc5 Fix bug #4464: Missing autoscroll when selecting by mouse drag. 
It's not very fast, but I guess that's a general problem with our scrolling. At least it works now, but it's not perfect.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34659 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-14 22:14:05 +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
Richard Heck
cd78e02a24 Minor code cleanup. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34636 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-09 15:14:22 +00:00
Vincent van Ravesteijn
068d87a711 Constify GuiView::busy(). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34622 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-07 22:09:59 +00:00
Vincent van Ravesteijn
a26a9be9bc Fix the storage of the last opened files list when having multiple windows. We need to know whether a view is closed by the user pressing the x (clearing the last-opened list of previous closed windows), or whether the view is closed in a cascade of all views (no clearing of the last-opened list). 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34621 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-07 22:07:38 +00:00
Vincent van Ravesteijn
098f722a1f Fix part of bug #5942: 
- buffer-switch does open tabs even when open in tabs is disabled;
- buffer-switch open the document in a new tab even if it is already opened in another view.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34618 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-07 21:57:37 +00:00
Peter Kümmel
ddc38c93ca don't block GUI when showing all debug messages 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34612 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-07 20:25:41 +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
Vincent van Ravesteijn
8bbd8bc44c Fix bug #6606: Crash when reverting a document with a not available document class. 
If the document class is not available, we now issue a warning for the user. This triggers a focusInEvent of the WorkArea and the cursor is issued to start blinking. However, when reverting a document the cursor is probably invalid and there has been no chance yet to fix it as we are still reading the file. 

The solution is to not show the cursor when the view is still busy.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34590 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-04 13:24:03 +00:00
Peter Kümmel
acbfa35458 fix bug #6748: queue LyXErrMessages so any other stuff is done 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34589 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-03 21:24:20 +00:00
Jean-Marc Lasgouttes
b25d19435a fix compilation on F13 and binutils/gold by rewriting specialized X11 code 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34588 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-03 07:26:19 +00:00
Vincent van Ravesteijn
f642e45a39 Fix the warning message "TocModel.cpp: type not found" when (re-)loading a file. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34571 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-06-01 09:56:07 +00:00
Uwe Stöhr
c1bde420f8 GuiBox.cpp: 
- fix another bug: shaded boxes can have a specified width when there is an inner box
- code optimizations according to http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg160048.html

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34532 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-28 03:01:18 +00:00
Pavel Sanda
85d9812dcc Move hints from designer to code 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34501 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-25 11:53:58 +00:00
Pavel Sanda
9f9104d9c4 Introduce output_sync ui for forward/reverse search 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34498 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-25 11:36:00 +00:00
Uwe Stöhr
643803d0e2 GuiBox.cpp: fix #6721 
Also for branch?

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34471 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-23 16:36:06 +00:00
Uwe Stöhr
84bc1aa4b4 GuiDocument.cpp: code simplifications; thanks Vincent 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34436 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-18 21:08:06 +00:00
Uwe Stöhr
665dac3f53 GuiDocument.cpp: remove superfluous comment 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34430 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-18 02:59:48 +00:00
Uwe Stöhr
0600e656f8 * GuiDocument: 
- fix #6699; use_geometry now only means that the user don't want to have custom margins; that geometry also needs to be loaded for some paper formats is already done in BufferParams.cpp
- remove portraitChanged() because this was useless - A4 landscape is still A4 and still uses the default margins

* BufferParams.cpp: only output the margins if the option "Default margins" is not checked - this was a bug in the margins UI

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34429 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-18 02:56:36 +00:00
Uwe Stöhr
700447301c support for all page sizes that are supported by the geometry package; fileformat change 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34427 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-18 01:22:08 +00:00
Pavel Sanda
7ee7b892d0 Coding style, thanks Abdel. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34417 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-17 08:15:04 +00:00
Pavel Sanda
7bc7f16c3c Next attempt on correct newlines in Message pane 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34416 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-16 22:02:15 +00:00
Uwe Stöhr
1ef3692019 - BufferParams.cpp: change string to make it more clear (requested by Jean-Pierre) 
- GuiView.cpp: fix grammar/logic

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34406 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-15 02:58:23 +00:00
Pavel Sanda
27c79955e9 #6694 - reset line spacing to single if no custom size is defined 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34405 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-14 19:12:59 +00:00
Vincent van Ravesteijn
ff129f2555 Fix crashes when the list of formts is empty. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34393 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-10 21:30:57 +00:00
Vincent van Ravesteijn
c6b08b9077 Fix bug #6686: Navigate back does not trigger a repaint 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34391 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-05-10 11:02:45 +00:00
Vincent van Ravesteijn
b24862e754 Correctly enable/disable the filter label and textfield in the TocWidget. Also, shorten the code a bit. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34350 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-30 15:56:54 +00:00
Jürgen Spitzmüller
4a4d7a57f2 * GuiSpellchecker.cpp: fix bug 6676. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34345 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-30 09:52:00 +00:00
Enrico Forestieri
a03faee92d There is no reason for inhibiting the symbols dialog in mathed. 
The dialog only offers symbols defined in the unicodesymbols file
and they will be wrapped in \text{} when inserted in math mode,
so there is no risk that an untypesettable symbol gets inserted.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34344 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-30 08:27:03 +00:00
Pavel Sanda
11510dbfc7 Unify "* space" into "* Space", its just double work for translators. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34337 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 21:48:10 +00:00
Pavel Sanda
ea24773537 Unify Inter-word and Interword space strings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34335 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 21:48:03 +00:00
Enrico Forestieri
ba4e75f11c The character dialog was disabled in r30810 for solving an assertion 
due to a missing buffer and because the "dialog is only useful in texted".
The problem with the buffer member has been solved since then, and while
it is true that the character dialog is not much useful in mathed, it
is the only way for coloring only parts of equations. Given that this
would also be a regression with respect to 1.6, I am re-enabling it.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34327 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 15:49:00 +00:00
Vincent van Ravesteijn
6c4de0377c Fix bug #6614: Preview Other Format Button Greys Out After Preview. 
getStatus() returns false for LFUN_BUFFER_VIEW when a previewing process is running. So, if this process has finished we should free the menu item. 

P.S. on windows, the item does not get disabled anyway.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34324 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-28 04:51:05 +00:00
Vincent van Ravesteijn
d2cc4a5b92 Tweak for X11. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34294 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-26 10:26:06 +00:00
Vincent van Ravesteijn
f8d64b4799 Fix bug #3871: Shortcut to switch from TOC to text pane. 
M-o now switches to the TOC pane, and Esc always returns from any DockView to the main window.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34293 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-26 10:03:09 +00:00
Vincent van Ravesteijn
f65f5be6d7 Fix bug #6451 (last part): Crash when interacting with buffer-dependent dialog with no buffer open. 
- First, the comment for isBufferDependent is corrected. It seems that the actual use of this function differs from the comment. As the comment said, I decided to close all dialogs that were buffer dependent, but this didn't seem to be correct for the view source pan, the outliner, and find-and-replace.

- Second, the dialogs that are buffer dependent are now closed, but dockviews are not, except for the spellchecker pane, which really depends on an open buffer, but I can't test that. 

So, please test whether the spellchecker dockviewed window behaves as one expects.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34291 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-26 02:12:10 +00:00
Vincent van Ravesteijn
28b167bfff Make sure the Table of Contents is always on top in the model combobox of the TocWidget. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34290 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-26 01:36:24 +00:00
Vincent van Ravesteijn
c6c0559be0 Fix bug #6672 (part 2): Add tooltips to the outliner. 
At some point we should implement that the tooltips are only shown when they are not completely shown in the outliner. However, this requires extending the QTreeView class. 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34287 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-26 00:43:08 +00:00
Peter Kümmel
7f09a8b58b cmake: remove recursive call, even if it breaks merged builds with GCC, fix linker error on win32 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34283 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-23 13:20:28 +00:00
Peter Kümmel
7aecb18f56 cmake: remove recursive call, even if it breaks merged builds with GCC, fix linker error on win32 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34280 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-23 12:58:17 +00:00
Peter Kümmel
be9fdbcad4 cmake: remove recursive call, even if it breaks merged builds with GCC 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34279 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-23 12:52:39 +00:00
Peter Kümmel
21514ad512 Seems boost also includes all std headers. Not including boost therefore produces errors. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34260 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 11:45:34 +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
Peter Kümmel
61b2bd5e7f Using "using namespace std" with msvc10 makes also std::tr1::bind visible and generates conflicts with boost::bind. 
Solution: don't use boost::bind for msvc10 (could also be extended  to several GCC versions)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34257 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-22 11:16:58 +00:00
Richard Heck
d01dec6dfe UI for XHTML options. I removed the xml line from OutputUi.ui 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34251 a592a061-630c-0410-9148-cb99ea01b6c8
 2010-04-21 15:20:31 +00:00