Commit Graph

246 Commits

Author SHA1 Message Date
Jürgen Spitzmüller
0d1a0c9b27 Cleanup the listings dialog and make its content translatable (bug 3645):
* src/frontends/qt4/QListings.cpp:
	- make widget entries translatable
	- clean up and shuffle around some code

* src/frontends/qt4/ui/ListingsUi.ui:
	- set isEditable here, not in QListings.cpp

* src/frontends/qt4/QDocument.cpp:
* src/frontends/qt4/QInclude.cpp:
	- make Listings strings translatable

Fix bug 3654 (by Bo Peng):

* src/frontends/qt4/QListings.h:
	- new slot on_numberSideCO_currentIndexChanged

* src/frontends/qt4/QListings.cpp:
	- use this slot and enable(disable the appropriate widgets

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18432 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-20 14:31:15 +00:00
Jürgen Spitzmüller
4d5c28c305 * src/frontends/qt4/QListings.cpp:
- add Apply button
* src/frontends/qt4/ui/ListingsUi.ui:
	- add Apply button
	- add accelerators

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18409 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 18:35:28 +00:00
Jürgen Spitzmüller
51b657c6cc * src/frontends/qt4/ui:
- make dialog non-modal (fix bug 3636)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18408 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 15:44:07 +00:00
Bo Peng
4bf2660863 InsetListings: change Params to Parameters for include dialog, Bug 3638
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18403 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-18 14:24:11 +00:00
Bo Peng
f827bcd96e InsetListings: separate first and last lines to a separate group box called range, fix bug 3628
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18385 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-17 18:23:45 +00:00
Bo Peng
40a746bb0f InsetListings: Use a combo box for number placement, fix bug 3623
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18372 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-16 20:28:46 +00:00
Bo Peng
be8a8c302c InsetListings: rename Number style to Line numbering, as suggested by Uwe, bug 3621
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18368 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-16 13:57:58 +00:00
Bo Peng
291b765a61 InsetListings: fix bug mouse symbol in the layout dialog, bug 3620
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18362 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-16 02:58:00 +00:00
Edwin Leuven
ccc639d842 * layout tweak
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18332 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-15 07:22:55 +00:00
Bo Peng
72e0b87a90 Separate caption and label from InsetListingsParams and handle them separately in listings and Include dialog, from Jurgen
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18324 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-14 20:42:14 +00:00
Bo Peng
accafcb88c InsetListings: use Edwin's dialog, which is much nice
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18311 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-14 14:56:21 +00:00
Bo Peng
0bbdc3ffeb InsetListings: Enhanced listings dialog, more than 10 widgets are added to handle common listings parameters.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18282 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-13 04:06:37 +00:00
Bo Peng
b8813615ea InsetListings: touch up the TextLayout dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18271 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-11 17:59:32 +00:00
Bo Peng
203b569b7b InsetListings: touch up the include dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18270 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-11 17:53:01 +00:00
Bo Peng
6099a3dba7 InsetListings: touch up the listings dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18269 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-11 16:56:16 +00:00
Bo Peng
fe879a0a6c revert src/frontends/qt4/ui/ListingsUi.ui
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18260 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-10 20:56:58 +00:00
Peter Kümmel
950e4b2097 fix crash: change empty line to paragraph and press a key
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18259 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-10 17:55:07 +00:00
Bo Peng
4ce743a0a7 Add support for listings package. Two listings command \lstinline, \lstinputlisting and an environment \lstlisting are supported, along with preamble \lstset. \lstinputlisting is implemented through Include dialog, and the other two are implemented with a new inset listings, along with its dialog.
* src/LyXAction.cpp: listing-insert action
	* src/insets/Inset.h,cpp: LISTINGS_CODE
	* src/insets/InsetInclude.cpp: handle \lstinputlisting
	* src/insets/InsetListings.h,cpp: new listings inset
	* src/insets/InsetListingsParams.h,cpp: parameters from listings package
	* src/insets/InsetCommandParams.h,cpp: handle lstinputlisting option
	* src/Bidi.cpp: handle LISTINGS_CODE
	* src/frontends/qt4/ui/TextLayoutUi.ui: update UI
	* src/frontends/qt4/ui/ListingsUi.ui: new dialog
	* src/frontends/qt4/ui/IncludeUi.ui: update UI
	* src/frontends/qt4/QInclude.h,cpp: add lstinputlisting
	* src/frontends/qt4/QDocument.h,cpp: add textedit for preamble listings_params
	* src/frontends/qt4/QListings.h,cpp: new listings inset
	* src/frontends/qt4/Dialogs.cpp: new listings dialog
	* src/frontends/controllers/ControlInclude.h,cpp: add lstinputlisting
	* src/frontends/controllers/ControlListings.h,cpp: new listings inset
	* src/LyXFunc.cpp: handle LISTING_CODE
	* src/Paragraph.cpp: handle LISTING_CODE
	* src/factory.cpp: new listings inset
	* src/CutAndPaste.cpp: handle LISTINGS_CODE
	* src/LaTeXFeatures.cpp: require listings
	* src/Text3.cpp: Handle LISTINGS_CODE
	* src/lfuns.h: add LFUN_LISTING_INSERT
	* src/Buffer.cpp: change lyx file format to 269
	* src/BufferParams.h,cpp: add listings_params to preamble
	* lib/lyx2lyx/LyX.py: lyx2lyx 
	* lib/lyx2lyx/lyx_1_5.py: lyx2lyx
	* lib/ui/stdmenus.inc: new menu item (no shortcut!)
	* src/insets/Makefile.am: update autotools
	* src/frontends/controllers/Makefile.am
	* src/frontends/qt4/Makefile.dialogs
	* src/frontends/qt4/Makefile.am
	* po/POTFILES.in: a few more translatable files.
	* development/scons/scons_manifest.py: scons build system
	* development/FORMAT: document format changes


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18243 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 19:11:42 +00:00
Edwin Leuven
f5cfb824aa * set some sizehints to ingore so that toc widget does not take up too much space on toggle...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18240 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-09 08:23:57 +00:00
Abdelrazak Younes
ab2324315b TOC Widget beautification by Stefan Schimanski:
* lib/images: 3 new icons 
* TocUi/TocWidget: Replace labeled button with icon buttons.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18202 a592a061-630c-0410-9148-cb99ea01b6c8
2007-05-04 17:37:05 +00:00
Bo Peng
6fdb8bf85a Rename .C ==> .cpp for files in src/frontends/qt4, part one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18014 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-26 03:53:02 +00:00
Michael Schmitt
1e7479247a * src/frontend/qt4/ui/NomenclUi.ui: fix tab order (by Ugras Baran)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18008 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-25 21:37:43 +00:00
Jürgen Spitzmüller
8dcd22492d * src/frontends/qt4/ui/DelimiterUi.ui:
somewhat better layout; ideally, the whole dialog should be laid out in a grid,
	but then qt insists on drawing the listwidgets much wider than the need to be.
	The drawback of this approach is that the dialog cannot really be resized.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17949 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-24 14:34:31 +00:00
André Pönitz
0575b97869 forgot this...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17937 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-24 09:02:09 +00:00
André Pönitz
a1607b414a renaming in frontends/qt4/ui: s/Q//g
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17936 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-24 08:56:28 +00:00
Jürgen Spitzmüller
c98876b48e Satisfy André's Sprachgefühl.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17900 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-22 08:37:48 +00:00
Michael Schmitt
33f2f32beb * src/frontend/qt4/ui/QDelimiter.ui: add space to unused label such
that no extra entry is created in the po files


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17892 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-21 15:29:55 +00:00
Jürgen Spitzmüller
44b504c45f * src/frontends/qt4/ui/QTocUI.ui: add tooltips.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17888 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-21 13:22:28 +00:00
Edwin Leuven
22fb43fd8f * removal of math panel
some code is moved from QMath 
  to QDelimiterDialog and QMathMatrixDialog
  for the rest pretty mechanical

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17872 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-19 21:42:42 +00:00
Richard Heck
4ef5d3fb59 Fix some shortcut issues with the converters subdialog. Problem was that some shortcuts defined here are also defined in the main preferences dialog, and some were doubly defined here, too. Also set focus proxy for definitions group box.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17864 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-19 17:29:59 +00:00
Jürgen Spitzmüller
f16d156a63 * src/frontends/qt4/ui/QPrefConvertersUI.ui: lay out in a grid (fixes bug 3476)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17862 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-19 16:37:39 +00:00
Abdelrazak Younes
4eb949274d Switch to an Icon View mode in the symbol lists.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17859 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-19 12:25:58 +00:00
Michael Schmitt
3c4367e0ac * QDelimiterDialog.C: make "TeX Code:" translatable
* ui/QDelimiterUi.ui: fix (unused) message - single \'s caused gettext problems


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17854 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-18 19:52:32 +00:00
Michael Schmitt
3f380081e0 * src/frontends/qt4/ui/QPrefConvertersUi.ui: add missing ':' in label
* po/de.po: adjust


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17853 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-18 19:36:12 +00:00
Uwe Stöhr
3802882900 fix bug 3456 and 3457
http://bugzilla.lyx.org/show_bug.cgi?id=3456
http://bugzilla.lyx.org/show_bug.cgi?id=3457

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17845 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-17 20:04:15 +00:00
Edwin Leuven
a2b645cbca layout tweak
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17802 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-14 09:49:52 +00:00
Richard Heck
c31c84926d Add margin to paragraph dialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17798 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-13 15:25:53 +00:00
Abdelrazak Younes
919d0e6e02 I forgot this in revision 17786. Hope bug 3450 is really fixed now...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17792 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-13 09:17:55 +00:00
Abdelrazak Younes
20c5d212ca * QPrefConvertersUi.ui
- change GUI layout in accordance with latest "copiers" and "file format" changes.
  - add converter cache section.

* QPrefsDialog: implement converter cache enabling and maximum age.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17791 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-13 09:16:06 +00:00
Richard Heck
580ca795dd Redo layout of dialog to solve sizing issue.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17789 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-13 02:07:55 +00:00
Richard Heck
eb07cac2c3 Changes to paragraph settings dialog so that it offers only
options accepted by the current paragraph.

ui/QParagraphUi.ui
  Changed combo box for alignment to radio buttons. Added
  checkbox for default alignment.
QParagraphDialog.[Ch]
  public:
    void checkAlignmentRadioButtons();
    void alignmentToRadioButtons(LyXAlignment);
    LyXAlignment getAlignmentFromDialog();
  private:
    typedef std::map<LyXAlignment, QRadioButton *> QPRadioMap;
    QPRadioMap radioMap;
  protected Q_SLOTS:
    void change_adaptor();
    void enableLinespacingValue(int);
    void on_alignDefaultCB_toggled(bool);
QParagraph.C
  Rework apply() and update_contents() using new functions just
  mentioned.

Thanks to Abdel for his help.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17776 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-11 14:04:40 +00:00
Richard Heck
687bc61934 Reorganize dialogs along lines suggested by Abdel to give more room to line edit boxes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17775 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-11 13:45:44 +00:00
Richard Heck
6bfc69eb38 Add vertical spacer.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17774 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-11 13:44:26 +00:00
Richard Heck
bd4e8ea46c Move alter button to match other dialogs.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17773 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-11 13:42:59 +00:00
Abdelrazak Younes
b4ef6a87a3 - Work a bit on the layout.
- Set the font used in the lists to Arial, 10.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17766 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-10 14:51:27 +00:00
Abdelrazak Younes
61023d5649 Fix bug 3413:
http://bugzilla.lyx.org/show_bug.cgi?id=3413

* ui/QNomenclUi.ui
  - description field: replace LineEdit with TexEdit

* QNomencl.C: take care of the \n <-> \\ conversion in the description field.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17748 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-06 16:27:10 +00:00
Abdelrazak Younes
f9347bc672 Make the delimiters dialog use true unicode symbols instead of pixmaps.
* ControlMath.[Ch]
  - mathSymbol(), texName(): new method for easy access of math symbols and associated TeX names
  - latex_delimiters: allowed delimiters transferred from QDelimiterDialog.C

* QDelimiterDialog.C:
  - makes use of the above.
  - display the TeX code in a label instead of beside the symbol.
 
* QDelimiterUi.ui
  - shrink it so that it could nicely fit in a DockWidget but this doesn't work, the dialog is too large!
  - texCodeL: new label.




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17747 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-06 15:57:32 +00:00
Richard Heck
11697004e8 Fix for bug 3215. All changes in src/frontends/qt4/.
Changed dialog and added routines to deal with an "auto" label
in cases where defaults are used.

ui/MarginsUi.ui: Changed labels for width and height to checkboxes. Removed connections.
checkwidgets.[Ch]: Extended checkedLineEdit routines to take a QWidget.
qt_helpers.[Ch]: 
  Added void lengthToWidgets(QLineEdit *, LengthCombo *, LyXLength const &, LyXLength::UNIT)
  Added void lengthAutoToWidgets(QLineEdit *, LengthCombo *, LyXLength const &, LyXLength::UNIT)
  Added void setAutoTextCB(QCheckBox *, QLineEdit *, LengthCombo *)
validators.[Ch]:
  Added class LengthAutoValidator : public LengthValidator
  Added class DoubleAutoValidator : public QDoubleValidator
QGraphicsDialog.[Ch]
  Added virtual void setAutoText()
  Added virtual void on_WidthCB_toggled(bool)
  Added virtual void on_HeightCB_toggled(bool)
  Used the new functions to set "auto" in default cases and toggle checkboxes as needed.
  Set validator for scale.
  Re-organized connect routines.
QGraphics.C:
  Completely re-worked update_contents().
  Significant changes to apply().


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17735 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-05 14:58:15 +00:00
Abdelrazak Younes
4f135f2dd6 Rework the delimiter dialog:
- ListWidget instead of combo,
- matched delimiters on the same row,
- immediate insertion on "enter" or "double-click" if the 'match' option is checked.
- simplification of the code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17731 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-05 12:12:07 +00:00
Abdelrazak Younes
29dacff0f0 Delimiter dilaog: Cleanup the code and rework the dialog a bit.
Most of the change is about using the new private member delimiters_ instead of the "delim" table.  Also, we don't display an icon when the delimiter is one character.
I did not manage to let the combos expand to the maximum.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17727 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-05 09:26:09 +00:00
Edwin Leuven
f56c8c83b0 * fix layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17717 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-04 13:10:38 +00:00
Abdelrazak Younes
1c9ea1546d Put file editor and Browse and Edit buttons in the same horizontal layout.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17715 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-04 12:50:20 +00:00
Michael Schmitt
16b8db280e * src/frontends/qt4/ui/QTabularUi.ui:
* src/frontends/qt4/QTabular.C: change "Block" to "Justified"
	to avoid translation clash and to align with paragraph settings


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17694 a592a061-630c-0410-9148-cb99ea01b6c8
2007-04-01 21:51:17 +00:00
Uwe Stöhr
4ae693b025 better UI fix for bug 3364 from Richard
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17638 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-29 22:27:40 +00:00
Uwe Stöhr
ce899a9fa1 Fix bug 3364:
http://bugzilla.lyx.org/show_bug.cgi?id=3364

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17627 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-28 23:57:48 +00:00
Uwe Stöhr
65ddfecfaf fix rev 17625
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17626 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-28 23:43:29 +00:00
Uwe Stöhr
6f9eb5464a small adjustment to have the same button size for Browse and Edit button.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17625 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-28 23:35:25 +00:00
Abdelrazak Younes
2b0e8a0d9b Fix unreported bug related to 3246 by Richard Heck:
"View" button in TeX information dialog not enabled when file is selected with the keyboard. Problem was that SIGNAL itemSelectionChanged was not connected to anything. Also made some minor stylistic changes to the code.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17614 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-28 16:58:08 +00:00
Edwin Leuven
ff7dd5e06c adjust layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17587 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-27 07:57:09 +00:00
Jürgen Spitzmüller
c0a40bac98 * src/frontends/qt4/BulletModule.C:
* src/frontends/qt4/ui/BulletsUi.ui:
	- assure that six columns of bullets are displayed in the widget
	  (fix bug 3147).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17584 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-27 06:55:25 +00:00
Abdelrazak Younes
68e8329644 Add a vertical spacer for nice resizing.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17552 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 15:50:32 +00:00
Abdelrazak Younes
9fc7e95b56 Second present for Bo: De-clutter the widget:
- spacing set to zero
- controls moved to the side.
 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17551 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 15:34:23 +00:00
Edwin Leuven
4b4b5a55b3 correct tab order and remove duplicate shortcuts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17550 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 15:28:33 +00:00
Edwin Leuven
5fc7649ea9 make lyx compile again:
* qwidget doesn't have sizegrip property here

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17540 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 09:55:37 +00:00
Abdelrazak Younes
44efd43a1b Cleanup and polish of the Citation dialog:
- now simple citation insertion can be done with the keyboard only (enter key will close the dialog and insert the chosen key).
- now search also within bib entry information (very fast)
- new case sensitive option
- new regex option.
- QCitation: code simplified, some code went to ControlCitation.
- QCitationDialog: code simplified
- lots of polish in the dialogs...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17539 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 01:32:12 +00:00
Abdelrazak Younes
14f3344f0b Present for Bo: Cleanup ViewSource and make it a DockWidget.
* DockView.h: add the orientation option.

* QViewSource: now a model and a controller

* QViewSourceDialog: now only a simple QWidget.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17538 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-25 01:25:29 +00:00
Uwe Stöhr
f8e7fec3d4 small cleanup of the include dialog:
"Include" was for good reason the default method but not the first item in the dropdown list.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17467 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-18 03:42:40 +00:00
Abdelrazak Younes
51f2d5c064 adjust keyboard shortcuts for buttons.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17417 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-12 14:49:27 +00:00
Abdelrazak Younes
cb81965b1e * ControlToc:
- initialiseParams(): overload ControlCommand::initialiseParams() so that we can update the model at this point (QToc is the controller _and_ the model).
  - update(): new 
  - updateBackend(): new protected method to update the TocBackend (called for the "Update" button).

* QToc:
  - is now a QObject
  - modelReset: new Qt signal to indicate a model reset to associated dialog(s).
  - QToc(): avoid the duplicate update() call that will be done in the show command anyway.

* Dialogs.C
  - use new TocWidget in a DockView.

* TocWidget.[Ch]: renamed from QTocDialog. This striped down widget is only a widget that connects to the 'QToc' model/controller.

* DockView.h: new template class that encapsulates a given Widget inside a DockWidget and presents a Dialog::View interface.

* QTocUi.ui:
  - now is a simple Widget.
  - rearrange the buttons a bit
  - get rid of the unneeded close button.
  - modify the shortcut to "Promote" to 'r' because of a clash with "Alt-p" number (we really need real, always valid, shortcuts for all outline action!)




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17416 a592a061-630c-0410-9148-cb99ea01b6c8
2007-03-12 14:23:44 +00:00
Uwe Stöhr
2f76056e6c Fix bug 3292:
http://bugzilla.lyx.org/show_bug.cgi?id=3292
(fix tab order)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17379 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-27 23:48:57 +00:00
Uwe Stöhr
1761cccf91 fix wrong tooltip, bug 3273:
http://bugzilla.lyx.org/show_bug.cgi?id=3273

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17315 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-24 01:40:59 +00:00
Jürgen Spitzmüller
c4551768a3 * src/frontends/qt4/ui/QNomenclUi.ui:
- fix bug 3147: Incorrect input field order in glossary dialog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17136 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-11 13:29:53 +00:00
Abdelrazak Younes
d5669d9087 Fix bug 3176 ( Focus not set to edit box for inset->label):
http://bugzilla.lyx.org/show_bug.cgi?id=3176

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17088 a592a061-630c-0410-9148-cb99ea01b6c8
2007-02-07 17:00:37 +00:00
Michael Schmitt
3092763e2e * output_plaintext.C: cosmetics in comment: line length cannot be < 0
* frontends/qt4/ui/QPrefPlaintextUi.ui:
	* lyxrc.C: align descriptions (saves a message in *.po)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16777 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-20 14:51:40 +00:00
Edwin Leuven
3931b65341 * replace many toggled(bool) with changed() signals
the former is also trigged when updating dialogs. we should use toggled(bool) to en/disable widgets and in situations when we are sure that we always want to act on a toggle

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16724 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-17 13:06:16 +00:00
Michael Schmitt
bdadc8d496 * development/scons/scons_manifest.py:
* src/frontends/qt4/Makefile.dialogs:
* src/frontends/qt4/QPrefsDialog.C:
* src/frontends/qt4/QPrefsDialog.h:
* src/frontends/qt4/ui/compile_uic.sh:
* src/frontends/qt4/ui/QPrefAsciiUi.ui:
* src/frontends/qt4/ui/QPrefPlaintextUi.ui: rename QPrefAsciiUi.ui to QPrefPlaintextUi.ui; 
rename PrefAscii to PrefPlaintext

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16714 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-16 22:29:33 +00:00
Edwin Leuven
efdc3fee52 * avoid signal triggered by setChecked(bool)
* get rid of suprefluous mailer updates

should get rid of bugs:
http://bugzilla.lyx.org/show_bug.cgi?id=3076
http://bugzilla.lyx.org/show_bug.cgi?id=3077

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16705 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-16 12:24:49 +00:00
Jürgen Spitzmüller
2af1fccc61 * src/frontends/qt4/ui/QPrefCygwinPathUi.ui:
- fix layout (bug 3103).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16703 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-16 07:29:02 +00:00
Michael Schmitt
1f7a1257f1 * change LFUN file-insert-ascii to file-insert-plaintext
* change LFUN file-insert-ascii-para to file-insert-plaintext-para
* change LyXRC::RC_ASCIIROFF_COMMAND to LyXRC::RC_PLAINTEXT_ROFF_COMMAND
* change LyXRC::RC_ASCII_LINELEN to LyXRC::RC_PLAINTEXT_LINELEN
* replace "ascii" by "plaintext" in method names


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16697 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-15 22:49:14 +00:00
Jürgen Spitzmüller
24ba805e2a * src/frontends/qt4/ui/QGraphicsUi.ui:
- fix initial tab.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16582 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-07 17:59:47 +00:00
Michael Schmitt
332125a35d * src/frontends/qt4/ui/QCharacterUi.ui: fix resize problem
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16556 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-06 18:48:27 +00:00
Abdelrazak Younes
68005ba1ad Add ticks to the slider.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16545 a592a061-630c-0410-9148-cb99ea01b6c8
2007-01-06 09:40:36 +00:00
Jürgen Spitzmüller
9475c48bf2 * src/frontends/qt4/ui/QViewSourceUi.ui: remove bogus Whatsthis entry.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16330 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-19 08:17:47 +00:00
Jürgen Spitzmüller
a37f3198ad Trivial ui tweak:
* src/frontends/qt4/ui/QGraphicsUi.ui: fix tab accelerating order.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16325 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-18 20:17:12 +00:00
Jürgen Spitzmüller
506c5df84b * src/frontends/qt4/ui/QCitationUi.ui:
- fix shortcut

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16313 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-17 14:04:18 +00:00
Edwin Leuven
2c832e6578 more cleanup:
- clear selected keys on ok/cancel
 - update info when navigating with keyboard
 - add clear search button
 - don't allow search strings that return empty selection

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16277 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-15 09:58:44 +00:00
Jürgen Spitzmüller
a2dd2953fa clean up the clean up of the font panel in document dialog (roman family combo has to come first, not last).
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16215 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-09 09:54:50 +00:00
Michael Schmitt
103c37af4e * src/frontends/qt4/ui/QPrefUi.ui: clarify message
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16150 a592a061-630c-0410-9148-cb99ea01b6c8
2006-12-03 01:16:03 +00:00
Michael Schmitt
968879e629 * ui/BulletsUi.ui: add missing shortcut
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16063 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-26 14:44:38 +00:00
Abdelrazak Younes
10dd2cbdcb Toc Slider fixes from Ugras Baran.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16045 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-25 22:16:22 +00:00
Edwin Leuven
72aeab403f * clean layout of font panel in document dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16007 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-21 20:40:42 +00:00
Edwin Leuven
b3a449b088 * repair broken layout
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15992 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-19 19:43:36 +00:00
Michael Schmitt
653c52e2d2 * insets/insetbase.h:
* buffer.C:
	* LaTeX.C:
	* frontends/qt4/ui/QPrefFileformatsUi.ui:
	* MenuBackend.C: fix typo: "can not" => "cannot"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15981 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-19 12:43:22 +00:00
Georg Baum
2db7521b70 Add support for the esint package
* src/LaTeXFeatures.C
	(LaTeXFeatures::getPackages): handle esint and wasysym

	* src/mathed/MathMacroTable.[Ch]
	(requires_): New member: tell the feature this macro requires
	(MacroTable::insert): take new requires arg

	* src/mathed/MathMacroTemplate.C
	(MathMacroTemplate::asMacroData): adjust to change above

	* src/mathed/MathSupport.C
	(fontinfos): add esint10 font

	* src/mathed/InsetMathHull.C
	(InsetMathHull::doDispatch): AMS_ON -> package_on

	* src/mathed/MathMacroTable.h

	* src/mathed/MathFactory.C
	(initSymbols): read and store requires field for symbols

	* src/mathed/InsetMathSymbol.C
	(InsetMathSymbol::metrics): handle esint
	(InsetMathSymbol::takesLimits): ditto

	* src/buffer.C
	(LYX_FORMAT): update format
	(Buffer::validate): handle esint, AMS_ON -> package_on

	* src/bufferparams.C:
	(AMSTranslator): Rename to PackageTranslator
	(BufferParams::readToken): Read \use_esint
	(BufferParams::writeFile): Write \use_esint

	* src/frontends/qt4/QDocumentDialog.C: handle esint

	* src/frontends/qt4/ui/MathsUi.ui : add esint checkboxes

	* src/frontends/qt4/GuiFontLoader.C
	(symbol_fonts: Add esint10 font
	(symbolFamily): handle esint10 font
	(isChosenFont): Add comment

	* src/frontends/controllers/ControlMath.C
	(latex_varsz): Add new integral symbols

	* src/support/fontutils.C
	(win_fonts_truetype): Add esint10 font

	* src/bufferparams.h
	(enum AMS): rename to enum Package
	(use_esint): new parameter

	* src/lyxfont.[Ch]: Add esint font

	* lib/symbols: Add new integral symbols

	* lib/lyx2lyx/LyX.py
	(format_relation): Update format

	* lib/lyx2lyx/lyx_1_5.py: handle new format

	* lib/chkconfig.ltx: Test esint package

	* lib/images/math/oiintop.xpm
	* lib/images/math/sqintop.xpm
	* lib/images/math/sqint.xpm
	* lib/images/math/ointctrclockwiseop.xpm
	* lib/images/math/ointctrclockwise.xpm
	* lib/images/math/iiintop.xpm
	* lib/images/math/iintop.xpm
	* lib/images/math/sqiint.xpm
	* lib/images/math/iiint.xpm
	* lib/images/math/ointclockwiseop.xpm
	* lib/images/math/oiint.xpm
	* lib/images/math/dotsintop.xpm
	* lib/images/math/sqiintop.xpm
	* lib/images/math/ointclockwise.xpm
	* lib/images/math/iiiintop.xpm
	* lib/images/math/dotsint.xpm
	* lib/images/math/iiiint.xpm
	* lib/images/math/iint.xpm: new icons

	* lib/doc/LaTeXConfig.lyx.in: Add docs for esint package

	* lib/doc/UserGuide.lyx: Add short documentation of integral symbols

	* lib/Makefile.am: Add new files

	* development/scons/scons_manifest.py: ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15907 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-13 17:35:18 +00:00
Georg Baum
2c64f84300 Fix translation of ambiguous messages
* src/frontends/qt4/ui/QPrefConvertersUi.ui: Readd translation hint
	to label and remove broken tooltip that somebody created instead

	* src/messages.C
	(Messages::Pimpl::get): reenable stripping of [[..]] from
	untranslated messages


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15872 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-12 09:36:08 +00:00
Michael Schmitt
d78c8a0b0b * src/frontends/qt4/ui/QNomenclUi.ui: add shortcuts
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15853 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-11 00:40:04 +00:00
Michael Schmitt
c56671cec7 * src/frontends/qt4/qt_helpers.C:
* src/frontends/qt4/qt_helpers.h:
	* src/frontends/qt4/ui/Makefile.am:
	* Status.15x:
	* development/scons/qt4.py: fix localization for qt4 strings


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15786 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-07 18:09:55 +00:00
Michael Schmitt
e0ae3a1a04 ui/*.ui: <include location="local" >qt_helpers.h</include>
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15784 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-07 17:56:32 +00:00
Michael Schmitt
4e9bb0990f * src/frontends/qt4/ui/QCitationUi.ui: cosmetics: capitalize label
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15752 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-05 17:23:20 +00:00
Georg Baum
e35725d5c0 New nomenclature inset from Ugras
* src/LyXAction.C
	(LyXAction::init): Add LFUN_NOMENCL_INSERT and LFUN_NOMENCL_PRINT

	* src/insets/insetbase.C
	(build_translator): ditto

	* src/LaTeXFeatures.C
	(LaTeXFeatures::getPackages): Add nomencl

	* src/insets/insetnomencl.[Ch]: new insets InsetNomencl and
	InsetPrintNomencl

	* src/insets/insetbase.h: Add NOMENCL_CODE and NOMENCL_PRINT_CODE

	* src/insets/insetcommandparams.C
	(InsetCommandParams::findInfo): Add nomenclature and printnomenclature
	(InsetCommandParams::getCommand): Extend end of command protection to
	cover commands with only optional arguments like printnomenclature

	* src/insets/insetert.C
	(InsetERT::getStatus): disable LFUN_NOMENCL_INSERT and
	LFUN_NOMENCL_PRINT

	* src/insets/Makefile.am: Add new files
	* src/frontends/qt4/Makefile.dialogs: ditto
	* src/frontends/qt4/Makefile.am: ditto

	* src/factory.C
	(createInset): Handle InsetNomencl and InsetPrintNomencl
	(readInset): ditto

	* src/buffer.C
	(LYX_FORMAT): increase

	* src/lyxfunc.C
	(LyXFunc::dispatch): Handle nomenclature

	* src/LaTeX.C
	(LaTeX::deleteFilesOnError): Delete .nls file
	(LaTeX::run): Run makeindex for nomenclature
	(LaTeX::runMakeIndex): handle nomenclature options
	(LaTeX::deplog): Recognize nomenclature file

	* src/frontends/qt4/QNomenclDialog.[Ch]: new
	* src/frontends/qt4/QNomencl.[Ch]: ditto
	* src/frontends/qt4/ui/QNomenclUi.ui: ditto

	* src/frontends/qt4/Dialogs.C
	(Dialogs::build): handle nomenclature dialog

	* src/text3.C
	(LyXText::dispatch): Handle LFUN_NOMENCL_INSERT and
	LFUN_NOMENCL_PRINT
	(LyXText::getStatus): Ditto

	* src/lfuns.h
	(kb_action): Add LFUN_NOMENCL_INSERT and LFUN_NOMENCL_PRINT

	* lib/lyx2lyx/LyX.py
	(format_relation): Update 1.5 format range

	* lib/lyx2lyx/lyx_1_5.py
	(revert_nomenclature): New
	(revert_printnomenclature): ditto

	* lib/chkconfig.ltx: Test for nomencl package

	* lib/doc/LaTeXConfig.lyx.in: Add nomencl package

	* lib/doc/Extended.lyx: Add documentation for nomencl

	* lib/ui/stdtoolbars.ui
	(Toolbar "extra" "Extra"): Add nomencl-insert

	* lib/ui/classic.ui: Add nomencl-insert and nomencl-print
	* lib/ui/stdmenus.ui: ditto

	* development/scons/scons_manifest.py: Add new files

	* development/FORMAT: Describe new format


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15739 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-04 17:55:36 +00:00
Edwin Leuven
406c793cd8 * reorganisation of graphics dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15707 a592a061-630c-0410-9148-cb99ea01b6c8
2006-11-03 11:24:27 +00:00
Abdelrazak Younes
65354d63a7 small cosmetic cleanups:
* delete some comments
* use lyxerr instead of cout in PanelStack
* move PanelStack into lyx::frontend namespace


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15623 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 14:39:05 +00:00
Jürgen Spitzmüller
6eeb83498c * QPrefScreenFontsUi.ui: assing label to the correct (and existing) buddy.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15621 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-30 14:05:06 +00:00
Edwin Leuven
d539ab8282 Layout improvements
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15538 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-24 17:52:37 +00:00
Asger Ottar Alstrup
542910316c - Boring promote and demote instead of the sexy in and out
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15374 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-19 15:30:18 +00:00
Georg Baum
2c72e0ecaa Fix bug 2868
* src/insets/insetgraphics.C
	(findTargetFormat): return pdf for vector graphics

	* src/format.h
	(Flags): new enum describing format flags
	(flags_): new member variable for format flags
	(vectorFormat): new, tell whether a format can contain vector graphics

	* src/format.C: adjust to flags changes

	* src/frontends/qt[34]/QPrefsDialog.C
	(QPrefsDialog::QPrefsDialog): handle new vector flag
	(QPrefsDialog::switch_format): ditto
	(QPrefsDialog::updateFormatsButtons): ditto
	(QPrefsDialog::new_format): ditto
	(QPrefsDialog::modify_format): ditto

	* src/frontends/qt3/ui/QPrefFileformatsModule.ui
	* src/frontends/qt4/ui/QPrefFileformatsUi.ui
	(vectorCB): new checkbox for vector flag

	* src/lyxrc.C
	(LyXRC::read): read vector flag
	(LyXRC::write): write vector flag

	* lib/doc/Customization.lyx: document format flags

	* lib/configure.py
	(checkFormatEntries): Add vector flag to some formats


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15205 a592a061-630c-0410-9148-cb99ea01b6c8
2006-10-03 08:34:59 +00:00
Edwin Leuven
74344a8f4b further ui cleanup: correct tab order
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14856 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-31 13:46:28 +00:00
Edwin Leuven
27fa8c7d12 correct tab order + layout cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14855 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-31 13:07:05 +00:00
Edwin Leuven
e28114779b minimal effort implementation of:
* float widget as a .ui file
* floatplacement.[Ch] -> FloatPlacement.[Ch] 



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14838 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-25 13:40:01 +00:00
Abdelrazak Younes
3cf9a75bb3 remove qPixmapFromMimeSource. This caused the inclusion of Qt3 support headers which we want to get rid of.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14835 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-24 19:37:40 +00:00
Edwin Leuven
c98992f774 rework mathdelimiter dialog and add size combo...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14703 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 14:22:47 +00:00
Abdelrazak Younes
1004ba79f1 Port of Martin Vermeer's QNote work: fix of framed and shaded note.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14696 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-16 08:57:00 +00:00
Edwin Leuven
1a08a29b0f make bullet configuration functional in the document settings dialog
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14647 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-13 15:44:05 +00:00
Edwin Leuven
e9df3c9a5e remove accelerator keys (Alt+) from designer files...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14608 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-10 14:16:30 +00:00
Bo Peng
3002118616 Add more controls to the view-source dialog.
* src/buffer.[nC]: can write full source, separaet/rename makeXXXFile.
	* src/graphics/PreviewLoader.C: rename maleLaTeXFile to writeLaTeXSource
	* src/frontends/qt3/QViewSourceDialog.h, ui/QViewSourceDialogBase.ui,
		QViewSource.[hC], QViewSourceDialog.[hC]: qt3 frontend
	* src/frontends/qt4/QViewSource.[hC], ui/QViewSourceUi.ui,
		QViewSourceDialog.[hC]: qt4 frontend
	* src/frontends/controllers/ControlViewSource.[hC]: controller


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14539 a592a061-630c-0410-9148-cb99ea01b6c8
2006-08-04 13:59:12 +00:00
Bo Peng
7119a923d8 Add rc.geometry_height, geometry_width, geometry_xysaved to the preference dialogs (qt3/qt4).
* src/frontends/qt3/QPrefs.C, QPrefsDialog.C, ui/QPrefUIModule.ui
	* src/frontends/qt4/QPrefsDialog.C, ui/QPrefUi.ui


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14518 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-30 15:52:43 +00:00
Edwin Leuven
5f9b864a20 Math Panel:
* add dropdown menu with fractions
* repair panel switching



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14457 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-14 13:14:41 +00:00
Georg Baum
0c0c43b8eb merge booktabs branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14319 a592a061-630c-0410-9148-cb99ea01b6c8
2006-07-03 19:13:56 +00:00
Edwin Leuven
1f0a608b99 put citation dialog in good state:
- natbib style (the combox) works
- when moving/up down the item stays selected (allowing sequential ups/downs)
- when deleting the next selected entry gets focus (allowing sequential deletes)
- the info is now shown and updated
- find subsets the available entries as you type
- no additional find dialog (removed QCitationFind.ui)
- selecting with double-click
- removal of unused: Citation class, toVector() function


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14252 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-28 08:28:16 +00:00
Jean-Marc Lasgouttes
44a5cfc89c Renaming:
cygwin_path_fix		->	windows_style_tex_paths
	cygwin_path_fix_needed	->	tex_expects_windows_paths
	check_cygwin_path	->	check_windows_style_tex_paths
	use_cygwin_paths	->	use_windows_paths
	RC_CYGWIN_PATH_FIX	->	RC_TEX_EXPECTS_WINDOWS_PATHS

	* src/frontends/qt4/ui/QPrefCygwinPathUi.ui
	* src/frontends/qt3/ui/QPrefCygwinPathModule.ui
	  Updated checkbutton label and description

	* src/frontends/qt4/QPrefsDialog.C
	  (PrefCygwinPath): cygwin_path_fix -> windows_style_tex_paths
	  (QPrefsDialog): Enable checkbutton for native WIN32 builds

	* src/frontends/xforms/forms/form_preferences.fd
	  Updated label and name of checkbutton

	* src/frontends/xforms/FormPreferences.C
	  (apply): cygwin_path_fix -> windows_style_tex_paths
	           check_cygwin_path -> check_windows_style_tex_paths
	  (build): Enable checkbutton for native WIN32 builds
	  (update): Ditto
	  (feedback): Updated description

	* src/frontends/qt3/QPrefs.C
	* src/frontends/qt3/QPrefsDialog.C
	* src/frontends/qt3/QPrefsDialog.h
	  Renaming as above, enabled checkbutton for native WIN32 builds

	* src/support/os_unix.C
	* src/support/os.h
	* src/support/os_win32.C
	  Renaming cygwin_path_fix -> windows_style_tex_paths
	* src/support/os_cygwin.C
	  Ditto
	  (external_path, external_path_list): always return windows
	  style paths, not depending on the checkbutton status

	* src/lyxrc.C
	* src/lyxrc.h
	* src/lyxfunc.C
	* src/lyx_main.C
	  Renaming

	* lib/configure.py
	  Renaming, more meaningful diagnostics




git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14242 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 10:51:24 +00:00
Jürgen Spitzmüller
54acb900ad The Grand Font Selection Redesign:
* lib/lyx2lyx/LyX.py (format_relation): add file format 247 (from Georg BAUM).

        * lib/lyx2lyx/lyx_1_5.py: add convert_font_settings, revert_font_settings (from Georg BAUM).

        * lib/chkconfig.ltx: Test for newly supported font packages

        * lib/doc/LaTeXConfig.lyx.in: document newly supported font packages

        * lib/doc/UserGuide.lyx: document new UI.

        * lib/doc/Extended.lyx: update PostScript font documentation

        * development/FORMAT: document file format change 246->247.

        * src/tex-strings.[Ch]: new strings tex_fonts_roman, tex_fonts_sans, 
           tex_fonts_monospaced (with GUI equivalents).

        * src/buffer.C: Format up to 247.

        * src/bufferparams.C:
        new params fontsRoman, fontsSans, fontsTypewriter, fontsDefaultFamily,    
        fontsSC, fontsOSF, fontsSansScale and fontsTypewriterScale
        (LyXFont const BufferParams::getFont): consider switch of default family.
        (string const BufferParams::loadFonts): new method to get all the LaTeX 
        font stuff done.

        * src/paragraph.C
        (LyXFont const Paragraph::getFont):
        (LyXFont const Paragraph::getLabelFont):
        (LyXFont const Paragraph::getLayoutFont): user buffer's not textclass's 
        default font

        * src/text.C
        (int LyXText::leftMargin):
        (int LyXText::rightMargin): user buffer's not textclass's default font

        * src/text2.C
        (LyXFont LyXText::getFont):
        (LyXFont LyXText::getLayoutFont):
        (LyXFont LyXText::getLabelFont): check if the family of the default document 
        font has been customized.

        * src/frontends/gtk/GDocument.[Ch]: implement new font ui (from Georg BAUM).

        * src/frontends/gtk/glade/document.glade: implement new font ui (from Georg BAUM). 

        * src/frontends/qt3/Makefile.dialogs: add new FontModuleBase

        * src/frontends/qt3/ui/FontModuleBase.ui: new File

        * src/frontends/qt3/ui/TextLayoutModuleBase.ui: remove font widgets

        * src/frontends/qt3/QDocument.C
        * src/frontends/qt3/QDocumentDialog.[Ch]: implement new font ui

        * src/frontends/qt4/Makefile.dialogs: add new FontUi

        * src/frontends/qt4/QDocumentDialog.[Ch]: implement new font ui

        * src/frontends/qt4/ui/FontUi.ui: new File

        * src/frontends/qt4/ui/TextLayoutUi.ui: remove font widgets

        * src/frontends/qt4/ui/compile_uic.sh: add new FontUi

        * src/frontends/xforms/FormDocument.[Ch]: implement new font ui

        * src/frontends/xforms/forms/form_document.fd: add new font tab.

        * src/frontends/controllers/ControlDocument.[Ch]
        (char ControlDocument::fontfamilies):
        (char ControlDocument::fontfamilies_gui):
        (bool ControlDocument::isFontAvailable):
        (bool ControlDocument::providesSC):
        (bool ControlDocument::providesOSF):
        (bool ControlDocument::providesScale): new methods, providing font info.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14143 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 08:10:17 +00:00
Edwin Leuven
5c8f40106a Add new tableinsertwidget
+ Remove table widget from inserttable dialog

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13972 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-31 12:53:05 +00:00
Georg Baum
cf7e4e5e03 * src/frontends/qt4/ui/pch.h: remove
* src/frontends/qt4/ui/Makefile.am: remove unused rules


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13942 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-27 14:38:34 +00:00
Georg Baum
5b83287abe * src/format.[Ch]
(document_): new flag, telling whether this is a document format and
	we want to show this format in the export and view menus
	(documentFormat): accessor for document_

	* src/format.h: Add some documentation

	* src/frontends/qt3/QPrefsDialog.C
	(QPrefsDialog::QPrefsDialog): handle new documentCB checkbox
	(QPrefsDialog::switch_format): ditto
	(QPrefsDialog::updateFormatsButtons): ditto
	(QPrefsDialog::new_format): ditto
	(QPrefsDialog::modify_format): ditto

	* src/frontends/qt3/ui/QPrefFileformatsModule.ui: Add documentCB checkbox

	* src/frontends/qt4/QPrefsDialog.C
	(QPrefsDialog::QPrefsDialog): handle new documentCB checkbox
	(QPrefsDialog::switch_format): ditto
	(QPrefsDialog::updateFormatsButtons): ditto
	(QPrefsDialog::new_format): ditto
	(QPrefsDialog::modify_format): ditto

	* src/frontends/qt4/ui/QPrefFileformatsUi.ui: Add documentCB checkbox

	* src/frontends/xforms/FormPreferences.C
	(FormPreferences::Formats::build): handle new check_document checkbox
	(FormPreferences::Formats::input): ditto
	(FormPreferences::Formats::Add): ditto
	(FormPreferences::Formats::Browser): ditto

	* src/frontends/xforms/forms/form_preferences.fd: Add check_document
	checkbox

	* src/lyxrc.C
	(LyXRC::read): Remove compatibility code for 1.3 \format entries.
	Read the new format flags (but don't require them for 1.4
	compatibility)
	(LyXRC::write): Write the new format flags

	* src/MenuBackend.C
	(expandFormats): Remove the hardcoded exception for image formats
	and use Format::isDocument() instead

	* lib/doc/Customization.lyx: Document auto viever/editor and the
	"document format" flag


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13887 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-20 12:03:40 +00:00
Edwin Leuven
123cc28dba getting rid of qt4 convenience classes:
Index: src/frontends/qt4/QCitationDialog.C
Index: src/frontends/qt4/QCitationDialog.h
Index: src/frontends/qt4/ui/QCitationFindUi.ui

Index: src/frontends/qt4/QPrefsDialog.C
Index: src/frontends/qt4/QPrefsDialog.h
Index: src/frontends/qt4/ui/QPrefColorsUi.ui
Index: src/frontends/qt4/ui/QPrefCopiersUi.ui
Index: src/frontends/qt4/ui/QPrefFileformatsUi.ui
Index: src/frontends/qt4/ui/QPrefConvertersUi.ui

Index: src/frontends/qt4/QParagraphDialog.C

no more qt3 drag n drop:

Index: src/frontends/qt4/QWorkArea.C

as discussed on list:

Index: src/frontends/qt4/QLyXKeySym.C
Index: src/frontends/qt4/QLyXKeySym.h

bit of repair here:

Index: src/frontends/qt4/ui/QAboutUi.ui
Index: src/frontends/qt4/QAbout.C

bit of cleaning here (no separate color column, but rather icon)

Index: src/frontends/qt4/QBranches.C

got rid of this altogether:

Index: src/frontends/qt4/qcoloritem.C
Index: src/frontends/qt4/qcoloritem.h
Index: src/frontends/qt4/Makefile.am

+ filedialog to qt4 one



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13805 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-07 10:20:43 +00:00
Abdelrazak Younes
668beb6c25 Remove "limits.h" for pch.h as this header is not used anywhere in the qt4 frontend.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13803 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-06 13:58:41 +00:00
Edwin Leuven
1032cc5ae8 getting rid of even more qt3 convenience classes and unused headers...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13796 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-04 07:31:46 +00:00
Edwin Leuven
3c4e073313 get rid of convenience classes in the following dialogs (and associated implementation files):
Index: src/frontends/qt4/ui/QErrorListUi.ui
Index: src/frontends/qt4/ui/QExternalUi.ui
Index: src/frontends/qt4/ui/QSendtoUi.ui
Index: src/frontends/qt4/ui/QSpellcheckerUi.ui
Index: src/frontends/qt4/ui/QThesaurusUi.ui
Index: src/frontends/qt4/ui/QTexinfoUi.ui
Index: src/frontends/qt4/ui/QRefUi.ui



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13794 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-03 19:51:15 +00:00
Edwin Leuven
ee3e1bbba7 Replace Q3ListBox with QListWidget:
* QBibtexDialog.C
 * QBibtex.C
 * QBibtexUi.ui
 * QBibtexAddUi.ui
    


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13791 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-02 19:17:59 +00:00
Bo Peng
7cff3d5d5e Add lyxrc.use_lastfilepos and load_session to the qt4 preference dialog.
* src/frontends/qt4/QPrefsDialog.C, connect checkboxes to lyxrc
	* src/frontends/qt4/ui/QPrefUi.ui, add two checkboxes.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13766 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-27 18:19:14 +00:00
Abdelrazak Younes
9db70c5346 * ControlToc.[Ch]
- bool ControlToc::canOutline(): new method to test if outline is possible.
* TocModel: new class
* QToc is now the controller (inheriting ControlToc directly) and the model (using TocModel)
* QTocDialog is now only the view (inheriting Dialogs::View directly)
* Dialogs.C: updated toc controller and view correspondingly



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13692 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-18 09:57:47 +00:00
Jürgen Spitzmüller
436adb1605 * src/frontends/qt4/ui/QTocUi.ui: lay out in a grid.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13685 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 15:50:13 +00:00
Bo Peng
2f3ac2d20f Initial Qt4 support for view-source feature (r13610), from Bo Peng (ben.bob@gmail.com)
* add src/frontend/qt4/QViewSource.h/C, QViewSourceDialog.h/C, ui/QViewSourceUi.ui
	* modify corresponding qt4/Makefile.am Makefile.dialogs, Dialogs.C


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13682 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 14:13:41 +00:00
Abdelrazak Younes
9960bf9278 Fix related to r13635
closePB renamed to cancelPB

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13644 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 10:13:17 +00:00
Abdelrazak Younes
9dfa853d2c lib/Makefile.am: move math icons from no-install
QMathDialog.C: set icon paths
QMathUi.ui: set icon paths to lib/images/math for visual feedback in designer


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13614 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-09 21:14:58 +00:00
Georg Baum
6b753c5d97 Remove the images directory
* Makefile.am: remove image files
	* images/ChangeLog: delete
	* images/smallcaps.xpm: move to lib/images/font-smallcaps.xpm
	* lib/Makefile.am: add images to noinst files

Move the following files to lib/images/math:
	* images/README
	* images/delim.xbm
	* images/ams_misc.xbm
	* images/equation.xpm
	* images/delim.xpm
	* images/arrows.xbm
	* images/bop.xbm
	* images/matrix.xpm
	* images/delim0.xpm
	* images/delim1.xpm
	* images/misc.xbm
	* images/greek.xbm
	* images/ams_nrel.xbm
	* images/style.xbm
	* images/ams_ops.xbm
	* images/varsz.xbm
	* images/font.xbm
	* images/sub.xpm
	* images/sqrt.xpm
	* images/dots.xbm
	* images/space.xpm
	* images/deco.xbm
	* images/super.xpm
	* images/ams_arrows.xbm
	* images/style.xpm
	* images/ams_rel.xbm
	* images/brel.xbm
	* images/font.xpm
	* images/deco.xpm
	* images/frac.xpm

Adjust the following files to the moved images:
	* src/frontends/gtk/GMathPanel.C
	* src/frontends/gtk/Makefile.am
	* src/frontends/qt4/ui/QMathUi.ui
	* src/frontends/xforms/Makefile.am
	* src/frontends/xforms/FormMathsPanel.C


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13598 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-08 11:33:26 +00:00
Edwin Leuven
e3630e4076 clean up of the graphics dialog:
-layout
-enabling/disabling widgets
-tab order



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13574 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-06 21:04:27 +00:00
Abdelrazak Younes
bcb89509b3 * QMathUi.ui:
- replaced the sqrt etc QPushButton with QToolButton
 - modified the layout

* QMathDialog::QMathDialog
 - got rid of the fixed width for function QWidgetList


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13571 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-06 15:08:48 +00:00
Abdelrazak Younes
ed6eb3e4f2 Porting work from Edwin Leuven:
* QMathUi.ui: Port to Qt4, icons paths are hacked to point to ../lib/images/
* QMathDialog: Port to qt4
* iconpalette.C: fix cols calculation

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13557 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-05 15:10:34 +00:00
Abdelrazak Younes
ca474cf0d5 Resize the dialog so that the delimiters appears by couple on screen.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13552 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-05 13:16:52 +00:00
Abdelrazak Younes
5a4d33d97e Add outlining functionality to the Qt4 TOC dialog.
The Toc dialog is not finished yet, there's some clean-up to do especially in select_adapdator which doesn't seem to work. This makes lyx crash when clicking on the Up, Down, In or Out buttons.

    * frontends/qt4/QTocDialog.[Ch]: add automatic slots

    * frontends/qt4/QTocDialog.[Ch]: add "enableButtons(bool)"

    * frontends/qt4/ui/QTocUi.ui: add pushbuttons

    * frontends/qt4/QToc.[Ch]: add move* methods.

The following Qt4 equivalent changes to revision r13521 are not done yet:
    * frontends/qt2/QToc.[Ch]: add move* method.
    (QToc::updateToc):
    (QToc::select): add code for TOC window positioning, and
    outlining methods



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13530 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-29 16:57:47 +00:00
Abdelrazak Younes
2f415cfbb1 This new citation dialog follows a new design similar to lyx-1.3:
- two panes for Selected/Available keys
- find as you search (Regular expression are supported)
- advanced search button

There are a lot of work still:
- selected citations are not inserted in the document
- find does not select the found key
- the graying/un-graying of buttons does not work properly
- the Advanced Search Dialog (which will search inside the citation) is not done yet
- ...
But the good news is that I have used the Model/View separation of Qt4. QCitation contains the list models and QCitationDialog contains the list views. The idea would be to reuse the model for a new dialog, I am thinking of a simple combo box placed on the toolbar which insert citations with default style, etc. Or a context menu insert->citation...



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13496 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-25 21:26:09 +00:00
Abdelrazak Younes
87c311f815 Compilation Fix: Appended "Ui" to main objectName so that it is the same as the ui file.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13484 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-24 15:59:11 +00:00
Abdelrazak Younes
f44bd092bc * src/frontends/qt4/QPrefsDialog.C
(QPrefsDialog::QPrefsDialog):
         (void QPrefsDialog::apply):
         (void QPrefsDialog::update):
         * src/frontends/qt4/ui/QPrefUI.ui:  remove wheel mouse spin box (bug 783).


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13464 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-23 16:38:46 +00:00
Lars Gullik Bjønnes
41cfebb8eb src/frontends/qt4/ui/pch.h: new file
boost/libs/regex/src/Makefile.am: remove non-existant file


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13343 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-12 08:52:08 +00:00
Lars Gullik Bjønnes
12e5a52b92 Added initial qt4 work by Abdelrazak Younes
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13294 a592a061-630c-0410-9148-cb99ea01b6c8
2006-03-05 17:24:44 +00:00