Commit Graph

54 Commits

Author SHA1 Message Date
Uwe Stöhr
427aeff90f GuiBox.cpp, InsetBox.cpp: fix some wrong logic
- InsetBox.cpp:
 a framebox without inner box and without a width is \fbox
 a framebox with inner box is also \fbox
 a framebox without inner box and with width is \framebox

- GuiBox.cpp: the width checkbox must be checked if there is width
2013-05-25 15:07:17 +02:00
Uwe Stöhr
472732f92d GuiBox.cpp: addendum to [f04c7711/lyxgit]
- this was forgotten to commit;
(without this we would get invalid LaTeX code when changing in the box dialog a makebox without a width to a minipage and press apply - a makebox required to specify a width, at least an invisible one like "0cm")
2013-05-25 13:52:09 +02:00
Jean-Marc Lasgouttes
f04c7711b0 Fix empty width support for Box inset
* InsetBox and GuiBox: Use proper empty length instead of the broken -9.99col% trick
* some slight changes to the logic of GuiBox to make sure that values are set as needed.
* lengthToWidget(): handle properly the empty length case. All the other related Qt helpers did it already, it was probably an oversight. Also set the default_unit parameter as optional (not needed in this patch actually, but I got carried away :)
* allow generating LaTeX code for an empty length, since some broken code does that.
2013-05-24 15:44:59 +02:00
Uwe Stöhr
72b2c54fae GuiBox.cpp: fix a dialog initialization issue
thanks Jean-Marc for the hint
2013-05-06 01:31:04 +02:00
Richard Heck
cca2d4c927 Crush warning. 2013-03-23 09:14:44 -04:00
Uwe Stöhr
22ad7e4369 support for \mbox and \fbox
- fileformat change
- it was a pity that LyX did not yet support a simple rectangular frame without a defined width but LyX did this for e.g. oval frames
- \fbox and \mbox often occur in TeX files and can now be imported
2013-03-22 01:33:58 +01: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
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
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
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
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
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
Abdelrazak Younes
bbda43a400 Attempt to simplify as much as possible Inset parameter dialog creation. We now just need an ui file and a class that inherits InsetParamsWidget and implement 4 methods. Then InsetParamsDialog will take care of the rest. InsetParamsDialog has 2 running mode: "immediate apply" and "Restore/OK/Close" which is the default; I hope this is enough to satisfy all users. The checkbox status might be saved later in session settings.
This new attempt replace the previous attempt with InsetDialog which was still too tight with the older framework.
Status:
float, ert, box, info: migrated
vspace: migrated but buggy. To be fixed later.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33480 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-15 23:17:45 +00:00
Abdelrazak Younes
ede4c8c370 GuiBox: don't call applyView twice
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33353 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-07 21:12:46 +00:00
Abdelrazak Younes
2f168bd342 Box dialog: migrate to the new InsetDialog architecture. This simplifies the code and allows for immediate application of any change in the dialog. This is quite a complicated and non intuitive dialog still...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33351 a592a061-630c-0410-9148-cb99ea01b6c8
2010-02-07 20:28:41 +00:00
Uwe Stöhr
8e3736c7b8 GuiBox.cpp: fix typo is comment
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@31820 a592a061-630c-0410-9148-cb99ea01b6c8
2009-11-01 23:23:54 +00:00
Jean-Marc Lasgouttes
26751d83ee Move the half baked code that guesses whether to default on metric or
imperial units in only one place (instead of thousands of slightly different
copies). Functionally equivalent.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28380 a592a061-630c-0410-9148-cb99ea01b6c8
2009-02-06 21:24:13 +00:00
Jürgen Spitzmüller
92c30f4294 * GuiBox.cpp:
- remove the useless "none" special length from the combo.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28153 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-14 14:10:52 +00:00
Jürgen Spitzmüller
5ba20465fe * LengthCombo.{cpp,h}:
- rename [add|remove]Item(unit) to [add|remove]Unit(unit)
	- remove now unnecessary reimplemantations of QComboBox functions
	- new member setCurrentItem(QString)

* GuiBox.cpp:
	- set ItemData for special lengths, which simplifies the logic a lot.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28152 a592a061-630c-0410-9148-cb99ea01b6c8
2009-01-14 12:57:23 +00:00
André Pönitz
f1cba8ff64 more latin1..utf8 schanges. all of src/* should be utf8 now
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27425 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 15:58:50 +00:00
André Pönitz
1fc477efac thrid attempt at changing the naming pattern of the intermediated 'mocced' files
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27420 a592a061-630c-0410-9148-cb99ea01b6c8
2008-11-14 14:28:50 +00:00
Jürgen Spitzmüller
e2fc0d4385 Box fixes from Vincent and me.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26711 a592a061-630c-0410-9148-cb99ea01b6c8
2008-10-04 09:24:40 +00:00
Jürgen Spitzmüller
38af9ccac5 GuiBox.cpp:
- disable width widgets for framed.sty boxes (bug 5069).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@25727 a592a061-630c-0410-9148-cb99ea01b6c8
2008-07-20 16:57:37 +00:00
Peter Kümmel
6abce3ec85 remove stupid windows defines
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24927 a592a061-630c-0410-9148-cb99ea01b6c8
2008-05-24 21:58:56 +00:00
Jürgen Spitzmüller
a210f17a19 * src/frontends/qt4/GuiBox.cpp:
* src/insets/InsetBox.cpp:
	- assure that framed boxes do not contain an inner box.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24116 a592a061-630c-0410-9148-cb99ea01b6c8
2008-04-04 13:33:52 +00:00
André Pönitz
3069acd6de remove InsetBoxMailer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24001 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-27 07:26:37 +00:00
André Pönitz
621e1b50a9 shorter code..
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23558 a592a061-630c-0410-9148-cb99ea01b6c8
2008-03-08 13:02:52 +00:00
Abdelrazak Younes
ba76bf5eb8 header cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23048 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-17 20:47:04 +00:00
Abdelrazak Younes
9f3c7cf1ea Factorize closeEvent() for GuiDialog based dialogs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23045 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-17 20:16:14 +00:00
Abdelrazak Younes
6bb94129d8 Factorize out the way window titles are handled.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22784 a592a061-630c-0410-9148-cb99ea01b6c8
2008-02-05 12:43:19 +00:00
Abdelrazak Younes
9383f4c3c6 'using namespace std' instead of 'using std::xxx'
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22097 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-12 10:16:00 +00:00
Jürgen Spitzmüller
8a13582720 * src/frontends/qt4/GuiBox.cpp:
- Fix button activation with pagebreak CB.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21948 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-04 11:29:43 +00:00
Jürgen Spitzmüller
3582be1441 framed.sty goes InsetBox:
* src/insets/InsetBox.{cpp,h}:
* src/frontends/qt4/GuiBox.{cpp,h}:
* src/frontends/qt4/ui/BoxUi.ui:
	- add and handle Framed and Shaded boxes
	- use more descriptive label names
	- implement name() function for Box:Shaded's sake

* src/insets/InsetNote.{cpp,h}:
* src/frontends/qt4/GuiNote.cpp:
* src/frontends/qt4/ui/NoteUi.ui:
	- remove Framed and Shaded.

* lib/layouts/stdinsets.inc:
	- remove Note:Framed and Note:Shaded
	- add Box:Shaded

* Buffer.cpp:
	- bump format to 304.

* lib/lyx2lyx/LyX.py:
* lib/lyx2lyx/lyx_1_6.py:
	- add conversion/reversion of framed/shaded notes to boxes.

* development/FORMAT:
	- document file format change.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21945 a592a061-630c-0410-9148-cb99ea01b6c8
2007-12-04 09:25:50 +00:00
André Pönitz
9d0ea8aeff Move debug.{cpp,h}, Messages.{cpp,h} and gettext.{cpp,h} to support/.
Now support/* should have no dependencies on src/* anymore.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21851 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-29 07:04:28 +00:00
Abdelrazak Younes
42015a8ebd Transfer some more dialog related code from core to frontend:
- LFUN_INSET_APPLY handling goes to GuiView.
- Dialog needs a GuiView instead of a LyXView.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21734 a592a061-630c-0410-9148-cb99ea01b6c8
2007-11-23 09:44:02 +00:00
André Pönitz
e7aa8ce683 cosmetics... less than intented
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21190 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-24 22:55:02 +00:00
André Pönitz
6f3cdf8da8 move Controller inheritance further up the tree
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20870 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-09 19:34:27 +00:00
André Pönitz
7a32331ab2 next one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20775 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-06 10:23:51 +00:00
Uwe Stöhr
a2fe099fc0 GuiBox.cpp: fix update of height checkbox
BoxUi.ui: fix the ui according to r20727
InsetBox.cpp: fix that e.g. "1\width" wasn't output to TeX

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20739 a592a061-630c-0410-9148-cb99ea01b6c8
2007-10-05 00:36:38 +00:00
Uwe Stöhr
e63f19a97a GuiBox: fix bug 3242 http://bugzilla.lyx.org/show_bug.cgi?id=3242:
make minipage optional height argument optional

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20547 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-27 20:19:06 +00:00
Uwe Stöhr
63d05dbff4 GuiBox.cpp: fix bug 4233 http://bugzilla.lyx.org/show_bug.cgi?id=4233
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20460 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-24 11:44:19 +00:00
André Pönitz
887bd847c6 remove unnneded #include
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20233 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 22:31:24 +00:00
André Pönitz
470aba2a0e cosmetics
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20217 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 18:33:42 +00:00
André Pönitz
34492a9d03 less functions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20216 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-11 17:06:15 +00:00
André Pönitz
94e61a3bc9 shuffle some frontend stuff around. merge controller(base) and "Kernel". Make frontend::Dialog pure virtual
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20202 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-10 22:32:59 +00:00
André Pönitz
c9ea6e6eef the fun begins....
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20077 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-05 20:33:29 +00:00
André Pönitz
9a95d2a936 rename a few view functions from foo() to fooView()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20024 a592a061-630c-0410-9148-cb99ea01b6c8
2007-09-03 20:28:26 +00:00