Commit Graph

249 Commits

Author SHA1 Message Date
Bo Peng
a5a508bdaa Change the indent level of python code from two to four
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14250 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 21:08:54 +00:00
Bo Peng
e941da3bdf Scons: fix DESTDIR, reloate intl/libintl.h, libgnuintl.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14239 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-27 03:53:04 +00:00
Bo Peng
de064bd88a Scons: remove pch, add stdlib_debug and profiling options
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14188 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-24 03:49:11 +00:00
Bo Peng
b6e42797d4 Scons: fix rebuildTargetOnly for lyx msvs projects
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14180 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-22 15:46:35 +00:00
Peter Kümmel
bc720fa2df add release option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14167 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-21 10:32:17 +00:00
Bo Peng
fe5c0415a4 Scons: restore fast_start, remove BOOST_USER_CONFIG in boost/config.h
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14164 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 16:46:35 +00:00
Bo Peng
865e5c25f2 Scons: config.h moves to BUILDDIR/common, boost_config.h moves to BUILDDIR/boost.
Do not use debug libraries for win/mingw.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14163 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 14:44:46 +00:00
Abdelrazak Younes
f032e0af1a revert commit 14159
QtView -> GuiView at the right place this time.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14160 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:56:31 +00:00
Abdelrazak Younes
e2c3e46a25 QtView -> GuiView
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14159 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 11:52:13 +00:00
Peter Kümmel
6aa29e1b9d add qt3 support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14157 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:59:48 +00:00
Peter Kümmel
118cdb2bd3 add qt3 support
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14156 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 09:57:19 +00:00
Abdelrazak Younes
d8ae51dbe1 This is the merging of the GUI API cleanup branch that was developed in svn+ssh://svn.lyx.org/lyx/lyx-devel/branches/personal/younes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14152 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-20 08:39:16 +00:00
Peter Kümmel
9ae369d22f move uic files into its own folder in the msvc project
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14147 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-19 15:49:48 +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
Bo Peng
dde45f75da Scons: link to qt debug lib in debug mode
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14139 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-18 04:04:23 +00:00
Bo Peng
29431ace2c Scons: imerge SConscript to SConstruct, separate config.h, code cleanup
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14133 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-17 04:43:44 +00:00
Peter Kümmel
4e7ca2d6f4 use glob instead of lists
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14131 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 17:26:32 +00:00
Peter Kümmel
585b386088 add item for QMAKESPEC
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14130 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 17:02:42 +00:00
Peter Kümmel
82db64c958 use glob instead of lists
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14129 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-16 16:43:17 +00:00
Peter Kümmel
330db5cce1 correct svn properties, upadte aspell handling
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14121 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 15:11:25 +00:00
Bo Peng
c287b1330e Scons: bug fix for default_boost_option
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14114 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-15 02:45:57 +00:00
Bo Peng
aa460e9217 Scons: improved option handling
* add option: optimization (=-O3 etc)
	* add load_option=opt1,opt2 or load_option=-opt1,opt2: selectively load options
	* CCFLAGS etc will replace default values, but not hardcoded ones.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14107 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 15:13:19 +00:00
Peter Kümmel
34424bb42d add Linux/Win GCC instructions
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14097 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 07:49:44 +00:00
Bo Peng
56134789f7 Scons: add qt2 frontend for lyx1.4
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14096 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-13 14:16:54 +00:00
Peter Kümmel
7c00f14cc1 Initial cmake support.
trunk/development/cmake/README.cmake:

Building LyX with CMake

CMake 2.4.2 or CVS version from www.cmake.org


Building Visual C++ 2005 project files:

- install Visual C++ 2005
- install Platform SDK 2005, "Core" and "Web Workshop"
- add include and library paths of the SDK to the IDE search paths,
  menu: Tools->Options->VC++ directories->Library files + Include files
- install zlib (www.zlib.net) into %ProgramFiles%/GnuWin32/include+lib
  or %ProgramFiles%/zlib/include+lib
- create a build directory, e.g. .../trunk/../build
- call in the build directory cmake ..\trunk\development\cmake
- start lyx.sln


To generate other build files call "cmake" 
which shows a list of possibilities.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14071 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 11:57:25 +00:00
Bo Peng
9d229c3f24 Scons: fix typos and minor bugs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14070 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-11 04:48:22 +00:00
Bo Peng
48ecd44845 Scons: Better MSVS Projects support (now with debug)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14069 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-10 21:02:11 +00:00
Bo Peng
6daeed854b Scons: ICONV_CONST bug fix, and some code clean-up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14066 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-10 02:21:28 +00:00
Bo Peng
c8eb10bbef Scons: version_suffix windows fix
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14063 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-09 18:44:28 +00:00
Bo Peng
210dbf394f Scons: version_suffix bug fix and improvement
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14062 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-09 17:11:15 +00:00
Bo Peng
f85e2778f3 Scons: link to libiconv if available
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14061 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-09 15:57:13 +00:00
Bo Peng
f8c24b0293 Distribute INSTALL.scons and development/scons with autotools
* development/Makefile.am: distribute development/scons directory
	* Makefile.am: distribute INSTALL.scons


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14051 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-08 16:36:38 +00:00
Bo Peng
257c6552ed Add INSTALL.scons, and a small adjustment of target all.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14049 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-08 15:57:45 +00:00
Peter Kümmel
4eed204e95 remove second QT_NO_STL, it was already there
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14048 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-08 15:26:51 +00:00
Peter Kümmel
e3784fcb6b $ svn diff
Index: SConscript
===================================================================
--- SConscript  (revision 14044)
+++ SConscript  (working copy)
@@ -390,7 +390,7 @@
     '-DQT_GENUINE_STR',
     '-DQT_NO_STL',
     '-DQT3_SUPPORT',
-    '-DQT_NO_STL'
+    '-DQT_NO_STL',
     ]
   )


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14045 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-08 14:20:56 +00:00
Peter Kümmel
2b205a09ba disable stl support functions of Qt4
$ svn diff
Index: SConscript
===================================================================
--- SConscript  (revision 14039)
+++ SConscript  (working copy)
@@ -390,6 +390,7 @@
     '-DQT_GENUINE_STR',
     '-DQT_NO_STL',
     '-DQT3_SUPPORT',
+    '-DQT_NO_STL'
     ]
   )



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14044 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-08 14:19:44 +00:00
Bo Peng
7fef63264b Scons: generate msvs porject files with target msvs_projects
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13994 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-03 22:15:35 +00:00
Martin Vermeer
1a77233c5f Add support for framed.sty
* src/LaTeXFeatures.C: add framed.sty

	(const * simplefeatures[]: add framed.sty
	(const LaTeXFeatures::getPackages): define shadecolor

	* src/insets/insetnote.h

	* src/insets/insetnote.C
	(const init_notetranslator):
	(InsetNote::setButtonLabel): add Framed and Shaded
	(InsetNote::latex): add output
	(InsetNote::validate): require framed.sty

	* src/buffer.C
	(BufferList bufferlist): new LyX version 246

	* src/frontends/qt3/ui/QNoteDialogBase.ui: add

	* src/frontends/qt3/QNoteDialog.C: add

	* src/frontends/qt3/QNote.C
	(QNote::update_contents): add framed, shaded
	(QNote::apply): add framed, shaded

	* src/LColor.[Ch]: add background colour for shaded

	* lib/lyx2lyx/LyX.py: New version support

	* lib/lyx2lyx/lyx_1_5.py: convert/revert

	* lib/chkconfig.ltx: add framed.sty

	* src/frontends/xforms/FormNote.C
	(FormNote::build):
	(FormNote::update): add FIXME

	* src/frontends/gtk/GNote.C
	(GNote::doBuild):
	(GNote::update):
	(GNote::apply): add FIXME

	* development/FORMAT: document format increase



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13993 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-03 16:46:27 +00:00
Bo Peng
62e8b7cf75 Scons: msvc command line support.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13984 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-02 18:36:29 +00:00
Abdelrazak Younes
6a742b7aa0 This patch removes qscreen.[Ch] and simplify the cursor drawing on screen. Basically, we paint now only if needed. So there's no need anymore to handle the "no cursor" pixmap saving.
SConscript: removed qscreen.C
frontends/qt4/Makefile.am: removed qscreen.C
frontends/screen.h: remove workarea() constness
frontends/qt3/qscreen.[Ch]: ditto
frontends/gtk/GScreen.[Ch]: ditto
frontends/xforms/xscreen.[Ch]: ditto
frontends/qt4/LyXScreenFactory.C: now return the QWorkarea directly
frontends/qt4/QWorkArea.[Ch]: inherits LyXScreen, handle the cursor painting
frontends/qt4/qscreen.[Ch]: removed 

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13981 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-02 12:01:28 +00:00
Bo Peng
79237ec01c Scons: two small bug fixes, and a bit more about msvc
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13975 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-01 03:01:46 +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
Bo Peng
44d2042c9a Scons: initial msvc support, and separate fast_start and load_option options.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13962 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-29 16:58:14 +00:00
Jean-Marc Lasgouttes
1b4d5f20e3 adapt lyxrc.dist to autoopen patch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13957 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-29 16:31:21 +00:00
Jean-Marc Lasgouttes
59c9d541c0 rename preferences to lyxrc.dist
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13956 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-29 16:30:31 +00:00
Bo Peng
16a8861cd5 Scons: add option rebuild that rebuild only specified targets, regardless of environment (e.g. CCFLAGS) changes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13952 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-29 14:59:20 +00:00
Bo Peng
a04cdd5d50 Scons: add more libintl related function/type tests.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13932 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-25 23:33:39 +00:00
Georg Baum
f0f4e2c042 From Joost Verburg: Put the clean_dvi.py script into the main distribution
* lib/configure.py
	(checkLatex): Add DraftDVI converter on windows if dv2dt and dt2dv
	are available
	(checkFormatEntries): Add DraftDVI entry on windows if dv2dt and
	dt2dv are available

	* lib/Makefile.am: add clean_dvi.py

	* development/Win32/packaging/build_lyxwin.sh: remove clean_dvi.py
	stuff

	* development/Win32/packaging/package_lyxwin.sh: remove configure
	mangling for clean_dvi.py

	* development/Win32/packaging/clean_dvi.py: move to lib/scripts

	* development/Win32/packaging/README: remove clean_dvi.py stuff


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13924 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-24 20:06:42 +00:00
Bo Peng
90933ac07a Scons: dest_dir option, cache command line option, fix a intl bug
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13914 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-23 00:27:05 +00:00
Bo Peng
7aeddf0bc3 Scons: fix a few bugs: qt4, included_ libs, command line argument with blank
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13894 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-21 15:50:55 +00:00