]> git.lyx.org Git - lyx.git/log
lyx.git
18 years agolib/configure.py: use \nonstopmode instead of -interaction=nonstopmode, from JMarc...
Bo Peng [Mon, 3 Jul 2006 15:28:13 +0000 (15:28 +0000)]
lib/configure.py: use \nonstopmode instead of -interaction=nonstopmode, from JMarc and Enrico

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14316 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: polish scons' 1.4.x support.
Bo Peng [Mon, 3 Jul 2006 02:02:11 +0000 (02:02 +0000)]
Scons: polish scons' 1.4.x support.
* INSTALL.scons: add instruction for 1.4.x
* development/scons/SConstruct: fix a installation bug for 1.4.x, better handling of QTDIR

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14311 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: rename option qt_include_path to qt_inc_path (we have extra_inc_path etc.)
Bo Peng [Sun, 2 Jul 2006 22:09:11 +0000 (22:09 +0000)]
Scons: rename option qt_include_path to qt_inc_path (we have extra_inc_path etc.)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14307 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: check the validity of QTDIR, and the existence of uic and moc
Bo Peng [Sun, 2 Jul 2006 17:35:14 +0000 (17:35 +0000)]
Scons: check the validity of QTDIR, and the existence of uic and moc

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14293 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: fix a isdir typo
Bo Peng [Sun, 2 Jul 2006 03:17:15 +0000 (03:17 +0000)]
Scons: fix a isdir typo

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14288 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agolib/configure.py: add -interaction=nonstopmode to cygwin/latex test.
Bo Peng [Sun, 2 Jul 2006 03:09:00 +0000 (03:09 +0000)]
lib/configure.py: add -interaction=nonstopmode to cygwin/latex test.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14287 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: set default qt lib directory under cygwin
Bo Peng [Sun, 2 Jul 2006 01:54:44 +0000 (01:54 +0000)]
Scons: set default qt lib directory under cygwin

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14286 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoRemove all tabs in lib/lyx2lyx/*.py, corresponding to the added -tt option
Bo Peng [Sat, 1 Jul 2006 19:16:09 +0000 (19:16 +0000)]
Remove all tabs in lib/lyx2lyx/*.py, corresponding to the added -tt option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14285 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoAdd config.h to src/frontends/qt4/Application.C to avoid MSVC BOOST_ALL_NO_LIB problem.
Bo Peng [Sat, 1 Jul 2006 18:14:58 +0000 (18:14 +0000)]
Add config.h to src/frontends/qt4/Application.C to avoid MSVC BOOST_ALL_NO_LIB problem.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14284 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago* ui/QPrefUIModule.ui: fix layout.
Jürgen Spitzmüller [Sat, 1 Jul 2006 11:22:33 +0000 (11:22 +0000)]
* ui/QPrefUIModule.ui: fix layout.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14282 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agomake sure eol-style native is set and fix eol style
Lars Gullik Bjønnes [Fri, 30 Jun 2006 14:50:44 +0000 (14:50 +0000)]
make sure eol-style native is set and fix eol style

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14279 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoMake signals and slots to not be defined, and replace them with Q_SIGNALS and Q_SLOTS
Lars Gullik Bjønnes [Fri, 30 Jun 2006 14:37:33 +0000 (14:37 +0000)]
Make signals and slots to not be defined, and replace them with Q_SIGNALS and Q_SLOTS

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14277 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoStop using 'sh uname' etc for cygdrive, from Enrico Forestieri <forenr@tlc.unipr.it>
Bo Peng [Fri, 30 Jun 2006 14:28:36 +0000 (14:28 +0000)]
Stop using 'sh uname' etc for cygdrive, from Enrico Forestieri <forenr@tlc.unipr.it>
* src/support/os_win32.C: Query the registry about cygwin, instead of
  calling uname

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14276 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agodelete some emits that I missed, add comments about emitting signals
Lars Gullik Bjønnes [Fri, 30 Jun 2006 14:11:50 +0000 (14:11 +0000)]
delete some emits that I missed, add comments about emitting signals

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14273 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoCall python with the -tt switch to make mixed tab/space indentation an error
Georg Baum [Fri, 30 Jun 2006 13:54:01 +0000 (13:54 +0000)]
Call python with the -tt switch to make mixed tab/space indentation an error

* src/support/os.[Ch]
(python): new function, return the python command

* lib/lyx2lyx/lyx_1_5.py
(revert_font_settings): replace tabs with spaces

The rest is simply s/python/python -tt/ and
s/"python"/lyx::support::os::python()/ where appropriate.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14270 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoDo not use the qt "keyword" emit. Make qt not emit it at all. (pun intended)
Lars Gullik Bjønnes [Fri, 30 Jun 2006 11:57:17 +0000 (11:57 +0000)]
Do not use the qt "keyword" emit. Make qt not emit it at all. (pun intended)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14269 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoReplace lib/scriptsfig2pdftex.sh and fig2pstex.sh by their python version
Bo Peng [Thu, 29 Jun 2006 15:30:22 +0000 (15:30 +0000)]
Replace lib/scriptsfig2pdftex.sh and fig2pstex.sh by their python version

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14265 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoinitialize correctly multiparsel_cache_ (may fix bug 2630); fix warning about initial...
Jean-Marc Lasgouttes [Thu, 29 Jun 2006 14:52:48 +0000 (14:52 +0000)]
initialize correctly multiparsel_cache_ (may fix bug 2630); fix warning about initialization order

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14264 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoReplace lib/scripts/fig_copy.sh with fig_copy.py
Bo Peng [Wed, 28 Jun 2006 14:26:27 +0000 (14:26 +0000)]
Replace lib/scripts/fig_copy.sh with fig_copy.py

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14261 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoremove annoying debug messages
Jean-Marc Lasgouttes [Wed, 28 Jun 2006 14:22:31 +0000 (14:22 +0000)]
remove annoying debug messages

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14260 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoheader cleanups and removal of unused methods.
Abdelrazak Younes [Wed, 28 Jun 2006 13:23:39 +0000 (13:23 +0000)]
header cleanups and removal of unused methods.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14258 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agosome connections not made because of:
Edwin Leuven [Wed, 28 Jun 2006 12:48:51 +0000 (12:48 +0000)]
some connections not made because of:
- signal typo
- slots typos

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14257 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoQURL renamed to UrlView
Abdelrazak Younes [Wed, 28 Jun 2006 12:09:25 +0000 (12:09 +0000)]
QURL renamed to UrlView

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14256 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoput citation dialog in good state:
Edwin Leuven [Wed, 28 Jun 2006 08:28:16 +0000 (08:28 +0000)]
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

18 years agoChange the indent level of python code from two to four
Bo Peng [Tue, 27 Jun 2006 21:08:54 +0000 (21:08 +0000)]
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

18 years agoPatch from Martin Vermeer for bug 2218.
Jean-Marc Lasgouttes [Tue, 27 Jun 2006 12:20:16 +0000 (12:20 +0000)]
Patch from Martin Vermeer for bug 2218.

* src/frontends/xforms/FormSpellchecker.C (update):
* src/frontends/qt[34]/QSpellchecker.C (update_contents): fix bug
2218: Spellchecker doesn't pop up dialogue window for the first
misspelled word.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14246 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoforward port it.po from 1.4.x branch to fix a bug with counters
Jean-Marc Lasgouttes [Tue, 27 Jun 2006 12:02:27 +0000 (12:02 +0000)]
forward port it.po from 1.4.x branch to fix a bug with counters

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14245 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoforward port pl.po from 1.4.x branch to fix a bug with counters
Jean-Marc Lasgouttes [Tue, 27 Jun 2006 12:01:17 +0000 (12:01 +0000)]
forward port pl.po from 1.4.x branch to fix a bug with counters

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14244 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago Renaming:
Jean-Marc Lasgouttes [Tue, 27 Jun 2006 10:51:24 +0000 (10:51 +0000)]
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

18 years agoPotential Bux fix: call "update()" instead of "vieport()->update()"
Abdelrazak Younes [Tue, 27 Jun 2006 10:28:04 +0000 (10:28 +0000)]
Potential Bux fix: call "update()"  instead of "vieport()->update()"

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14241 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoadd link to the task tracker of the Qt4 bug
Peter Kümmel [Tue, 27 Jun 2006 07:53:44 +0000 (07:53 +0000)]
add link to the task tracker of the Qt4 bug

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14240 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: fix DESTDIR, reloate intl/libintl.h, libgnuintl.h
Bo Peng [Tue, 27 Jun 2006 03:53:04 +0000 (03:53 +0000)]
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

18 years agoReplace TeXFiles.sh by TeXFiles.py
Bo Peng [Tue, 27 Jun 2006 02:39:03 +0000 (02:39 +0000)]
Replace TeXFiles.sh by TeXFiles.py
* src/frontends/controllers/tex_helpers.C: call TeXFiles.py
* lib/scripts/TeXFiles.py: add
* lib/scripts/TeXFiles.sh: remove
* lib/scripts/convertDefault.py: add encoding line
* lib/Makefile.am

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14238 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago* src/insets/insettabular.C (doDispatch): set cursor properly on mouse
Jürgen Spitzmüller [Mon, 26 Jun 2006 18:16:38 +0000 (18:16 +0000)]
* src/insets/insettabular.C (doDispatch): set cursor properly on mouse
(button 3) press. Fixes crash.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14237 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoPass width = 0 and height = 0 as unsigned int to indicate the usage of the geometry...
Peter Kümmel [Mon, 26 Jun 2006 18:07:10 +0000 (18:07 +0000)]
Pass width = 0 and height = 0 as unsigned int to indicate the usage of the geometry option
* lyx_main.C set             width and height to 0
* frontends/qt3/lyx_gui.C    test on 0
* frontends/qt4/lyx_gui.C    test on 0

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14235 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoGUI API Cleanup step 2: merge of the "younes" branch. What's missing
Abdelrazak Younes [Mon, 26 Jun 2006 17:18:28 +0000 (17:18 +0000)]
GUI API Cleanup step 2: merge of the "younes" branch. What's missing

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14234 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoRemoved files because of conflict when merging the "younes" branch
Abdelrazak Younes [Mon, 26 Jun 2006 17:14:25 +0000 (17:14 +0000)]
Removed files because of conflict when merging the "younes" branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14233 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoRemoved file because of conflict when merging the "younes" branch
Abdelrazak Younes [Mon, 26 Jun 2006 17:13:31 +0000 (17:13 +0000)]
Removed file because of conflict when merging the "younes" branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14232 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoGUI API Cleanup step 2: merge of the "younes" branch.
Abdelrazak Younes [Mon, 26 Jun 2006 16:55:35 +0000 (16:55 +0000)]
GUI API Cleanup step 2: merge of the "younes" branch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14231 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * lib/Makefile.am s/convertDefault.sh/convertDefault.py/
Georg Baum [Mon, 26 Jun 2006 15:13:32 +0000 (15:13 +0000)]
* lib/Makefile.am s/convertDefault.sh/convertDefault.py/

* src/converter.C
(Converters::convert): ditto

* src/graphics/GraphicsConverter.C
(Converter::Impl::Impl): ditto

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14227 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoFix limit display of intop and ointop
Georg Baum [Mon, 26 Jun 2006 15:01:35 +0000 (15:01 +0000)]
Fix limit display of intop and ointop
* src/mathed/math_scriptinset.C
(MathScriptInset::hasLimits): handle \intop and \ointop

* lib/symbols: add intop and ointop

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14225 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoGenerate python code in GraphicsConverter.C, replace convertDefault.sh by convertDefa...
Bo Peng [Mon, 26 Jun 2006 14:17:12 +0000 (14:17 +0000)]
Generate python code in GraphicsConverter.C, replace convertDefault.sh by convertDefault.py
* src/graphics/GraphicsConverter.C: generate python instead of shell scripts
* src/converter.C: use convertDefault.py
* lib/scripts/convertDefault.sh: translated to convertDefault.py

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14223 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agofix image paths in German UserGuide (part of bug 2660)
Jean-Marc Lasgouttes [Mon, 26 Jun 2006 10:35:31 +0000 (10:35 +0000)]
fix image paths in German UserGuide (part of bug 2660)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14216 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoFix 64bit<->32bit issue.
Lars Gullik Bjønnes [Sun, 25 Jun 2006 11:27:33 +0000 (11:27 +0000)]
Fix 64bit<->32bit issue.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14203 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago* reset color/linestyle/linewidth cache to QPen defaults on QPainter creation
Edwin Leuven [Sun, 25 Jun 2006 11:18:56 +0000 (11:18 +0000)]
* reset color/linestyle/linewidth cache to QPen defaults on QPainter creation
* get rid of QPainter arg in setQPainterPen(..)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14201 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: remove pch, add stdlib_debug and profiling options
Bo Peng [Sat, 24 Jun 2006 03:49:11 +0000 (03:49 +0000)]
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

18 years agorevert last accidental commit and do the intended one
Georg Baum [Fri, 23 Jun 2006 14:20:49 +0000 (14:20 +0000)]
revert last accidental commit and do the intended one

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14186 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * src/mathed/math_gridinset.C
Georg Baum [Fri, 23 Jun 2006 14:17:14 +0000 (14:17 +0000)]
* src/mathed/math_gridinset.C
(doDispatch): fix off by one error when checking cur.idx() (bug 2655)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14185 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago* qp_ member is now used for painting
Abdelrazak Younes [Fri, 23 Jun 2006 14:12:17 +0000 (14:12 +0000)]
* qp_ member is now used for painting
* QLPainter::start() now re-initialize qp_
* QLPainter::end() now end qp_

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14184 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * frontends/qt3/QtView.C: use QRect ctor, coding style
Peter Kümmel [Fri, 23 Jun 2006 10:19:31 +0000 (10:19 +0000)]
* frontends/qt3/QtView.C: use QRect ctor, coding style
* frontends/qt4/lyx_gui.C: coding style
* frontends/qt4/GuiView.C: use QRect ctor, coding style

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14183 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agolib/doc/UserGuide.lyx: remove description of obsolete Comment layout
Jean-Marc Lasgouttes [Fri, 23 Jun 2006 09:38:32 +0000 (09:38 +0000)]
lib/doc/UserGuide.lyx: remove description of obsolete Comment layout

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14182 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: fix rebuildTargetOnly for lyx msvs projects
Bo Peng [Thu, 22 Jun 2006 15:46:35 +0000 (15:46 +0000)]
Scons: fix rebuildTargetOnly for lyx msvs projects

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14180 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * readd accidentally removed code (rev 14143)
Georg Baum [Thu, 22 Jun 2006 09:25:02 +0000 (09:25 +0000)]
* readd accidentally removed code (rev 14143)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14177 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agofix wrong path to an image (bug 2653)
Jean-Marc Lasgouttes [Wed, 21 Jun 2006 13:21:31 +0000 (13:21 +0000)]
fix wrong path to an image (bug 2653)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14169 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoadd release option
Peter Kümmel [Wed, 21 Jun 2006 10:32:17 +0000 (10:32 +0000)]
add release option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14167 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agofix: qt3/qt4 save/restore of the window geometry and maximize status
Peter Kümmel [Wed, 21 Jun 2006 10:30:32 +0000 (10:30 +0000)]
fix: qt3/qt4 save/restore of the window geometry and maximize status

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14166 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: restore fast_start, remove BOOST_USER_CONFIG in boost/config.h
Bo Peng [Tue, 20 Jun 2006 16:46:35 +0000 (16:46 +0000)]
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

18 years agoScons: config.h moves to BUILDDIR/common, boost_config.h moves to BUILDDIR/boost.
Bo Peng [Tue, 20 Jun 2006 14:44:46 +0000 (14:44 +0000)]
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

18 years agoQtView renamed to GuiView
Abdelrazak Younes [Tue, 20 Jun 2006 14:35:36 +0000 (14:35 +0000)]
QtView renamed to GuiView

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14162 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago Redefine the speed-up "Wide" patch to draw proper boxes
Martin Vermeer [Tue, 20 Jun 2006 12:39:39 +0000 (12:39 +0000)]
Redefine the speed-up "Wide" patch to draw proper boxes
in available space instead of line pairs.

* rowpainter.C
(paintPar): change background rectangle

* insets/insettext.C
(InsetText::draw):
(InsetText::drawSelection): simplify rectangle drawing

* insets/insettext.h: dump Tall()

* insets/insetcollapsable.C
(InsetCollapsable::metrics): subtract button from available
space in case of inlined inset

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14161 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agorevert commit 14159
Abdelrazak Younes [Tue, 20 Jun 2006 11:56:31 +0000 (11:56 +0000)]
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

18 years agoQtView -> GuiView
Abdelrazak Younes [Tue, 20 Jun 2006 11:52:13 +0000 (11:52 +0000)]
QtView -> GuiView

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14159 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * insettabular.C (drawSelection): revision of previous patch:
Martin Vermeer [Tue, 20 Jun 2006 10:44:49 +0000 (10:44 +0000)]
* insettabular.C (drawSelection): revision of previous patch:
initialize table background

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14158 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoadd qt3 support
Peter Kümmel [Tue, 20 Jun 2006 09:59:48 +0000 (09:59 +0000)]
add qt3 support

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14157 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoadd qt3 support
Peter Kümmel [Tue, 20 Jun 2006 09:57:19 +0000 (09:57 +0000)]
add qt3 support

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14156 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoQtView renamed to GuiView
Abdelrazak Younes [Tue, 20 Jun 2006 09:33:01 +0000 (09:33 +0000)]
QtView renamed to GuiView

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14154 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago* [qt3, xforms, gtk]/GuiImplementation::newWorkArea: return 0
Abdelrazak Younes [Tue, 20 Jun 2006 09:17:19 +0000 (09:17 +0000)]
* [qt3, xforms, gtk]/GuiImplementation::newWorkArea: return 0
* qt4/Application.[Ch]: was not merged (GUI API cleanup merge) for an unknown reason
* qt4/clipboard.C: ditto

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14153 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoThis is the merging of the GUI API cleanup branch that was developed in svn+ssh:...
Abdelrazak Younes [Tue, 20 Jun 2006 08:39:16 +0000 (08:39 +0000)]
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

18 years agomove uic files into its own folder in the msvc project
Peter Kümmel [Mon, 19 Jun 2006 15:49:48 +0000 (15:49 +0000)]
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

18 years agoThe Grand Font Selection Redesign:
Jürgen Spitzmüller [Mon, 19 Jun 2006 08:10:17 +0000 (08:10 +0000)]
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

18 years ago * src/format.C
Georg Baum [Sun, 18 Jun 2006 10:51:59 +0000 (10:51 +0000)]
* src/format.C
(Formats::view): Call the viewer with the absolute filename instead
of changing the working directory to avoid a race condition on
systems with a slow fork().
(Formats::edit): Ditto (editor instead of viewer)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14142 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * insettabular.C (drawSelection): initialize cell background
Martin Vermeer [Sun, 18 Jun 2006 09:27:57 +0000 (09:27 +0000)]
* insettabular.C (drawSelection): initialize cell background

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14141 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agorestore (14087) save/load geometry logic of qt3
Peter Kümmel [Sun, 18 Jun 2006 09:05:41 +0000 (09:05 +0000)]
restore (14087) save/load geometry logic of qt3

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14140 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: link to qt debug lib in debug mode
Bo Peng [Sun, 18 Jun 2006 04:04:23 +0000 (04:04 +0000)]
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

18 years agoThose classes (and their associated [Ch] files) are renamed :
Abdelrazak Younes [Sat, 17 Jun 2006 09:14:58 +0000 (09:14 +0000)]
Those classes (and their associated [Ch] files) are renamed :

QLAction -> Action
lcolorcache -> ColorCache
qfont_loader.C -> FontLoader

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14136 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: imerge SConscript to SConstruct, separate config.h, code cleanup
Bo Peng [Sat, 17 Jun 2006 04:43:44 +0000 (04:43 +0000)]
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

18 years agouse glob instead of lists
Peter Kümmel [Fri, 16 Jun 2006 17:26:32 +0000 (17:26 +0000)]
use glob instead of lists

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14131 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoadd item for QMAKESPEC
Peter Kümmel [Fri, 16 Jun 2006 17:02:42 +0000 (17:02 +0000)]
add item for QMAKESPEC

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14130 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agouse glob instead of lists
Peter Kümmel [Fri, 16 Jun 2006 16:43:17 +0000 (16:43 +0000)]
use glob instead of lists

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14129 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agouse our own font width cache with Qt/Mac
Jean-Marc Lasgouttes [Fri, 16 Jun 2006 14:39:52 +0000 (14:39 +0000)]
use our own font width cache with Qt/Mac

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14128 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * lib/doc/de_Extended.lyx: mention htlatex
Georg Baum [Thu, 15 Jun 2006 17:08:26 +0000 (17:08 +0000)]
* lib/doc/de_Extended.lyx: mention htlatex
* lib/doc/Extended.lyx: ditto

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14123 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agodon't break the geometry option
Peter Kümmel [Thu, 15 Jun 2006 16:01:55 +0000 (16:01 +0000)]
don't break the geometry option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14122 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agocorrect svn properties, upadte aspell handling
Peter Kümmel [Thu, 15 Jun 2006 15:11:25 +0000 (15:11 +0000)]
correct svn properties, upadte aspell handling

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14121 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * INSTALL: Change required python version from 1.5.2 to 2.3
Georg Baum [Thu, 15 Jun 2006 08:44:28 +0000 (08:44 +0000)]
* INSTALL: Change required python version from 1.5.2 to 2.3
* INSTALL.scons: ditto
* README: ditto
* configure.ac: ditto

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14117 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * src/support/lyxalgo.h
Georg Baum [Thu, 15 Jun 2006 08:06:00 +0000 (08:06 +0000)]
* src/support/lyxalgo.h
(count): Compile fix (add forgotten typename)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14116 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: bug fix for default_boost_option
Bo Peng [Thu, 15 Jun 2006 02:45:57 +0000 (02:45 +0000)]
Scons: bug fix for default_boost_option

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14114 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: update INSTALL.scons according to Abdel's recommended links.
Bo Peng [Wed, 14 Jun 2006 20:10:36 +0000 (20:10 +0000)]
Scons: update INSTALL.scons according to Abdel's recommended links.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14113 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoremove references to deleted file QtLyXView.h
Georg Baum [Wed, 14 Jun 2006 19:26:23 +0000 (19:26 +0000)]
remove references to deleted file QtLyXView.h

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14112 a592a061-630c-0410-9148-cb99ea01b6c8

18 years ago * src/frontends/qt3/lyx_gui.C: compile fix
Georg Baum [Wed, 14 Jun 2006 15:49:36 +0000 (15:49 +0000)]
* src/frontends/qt3/lyx_gui.C: compile fix

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14109 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: improved option handling
Bo Peng [Wed, 14 Jun 2006 15:13:19 +0000 (15:13 +0000)]
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

18 years agoload and restore correct windows postion
Peter Kümmel [Wed, 14 Jun 2006 14:42:24 +0000 (14:42 +0000)]
load and restore correct windows postion

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14104 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoload and restore correct windows postion
Peter Kümmel [Wed, 14 Jun 2006 14:34:50 +0000 (14:34 +0000)]
load and restore correct windows postion

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14103 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoload and restore correct windows postion
Peter Kümmel [Wed, 14 Jun 2006 14:32:39 +0000 (14:32 +0000)]
load and restore correct windows postion

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14102 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoFix Qt4 resize bug.
Peter Kümmel [Wed, 14 Jun 2006 14:23:25 +0000 (14:23 +0000)]
Fix Qt4 resize bug.
Don't use  multiple QPainter::begin on the same QPaintDevice.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14101 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agocleanup zlib checking
Jean-Marc Lasgouttes [Wed, 14 Jun 2006 14:07:36 +0000 (14:07 +0000)]
cleanup zlib checking

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14100 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoadd Linux/Win GCC instructions
Peter Kümmel [Wed, 14 Jun 2006 07:49:44 +0000 (07:49 +0000)]
add Linux/Win GCC instructions

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14097 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoScons: add qt2 frontend for lyx1.4
Bo Peng [Tue, 13 Jun 2006 14:16:54 +0000 (14:16 +0000)]
Scons: add qt2 frontend for lyx1.4

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14096 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agocoding style and readability corrections
Peter Kümmel [Tue, 13 Jun 2006 08:24:43 +0000 (08:24 +0000)]
coding style and readability corrections

Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C     (revision 14088)
+++ frontends/qt3/lyx_gui.C     (working copy)
@@ -222,12 +222,12 @@

 void start(string const & batch, vector<string> const & files,
-          unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+          unsigned int width, unsigned int height, int posx, int posy, bool maximize)
 {
        // this can't be done before because it needs the Languages object
        initEncodings();

-       boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+       boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
        LyX::ref().addLyXView(view_ptr);

        QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C      (revision 14088)
+++ frontends/qt3/QtView.C      (working copy)
@@ -55,12 +55,12 @@

-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
        : QMainWindow(), LyXView(), commandbuffer_(0)
 {
        resize(width, height);

-       if(isMax)
+       if (maximize)
                this->setWindowState(WindowMaximized);

        qApp->setMainWidget(this);
@@ -164,7 +164,7 @@
 void QtView::closeEvent(QCloseEvent *)
 {
        LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
-       //don't save maximized values
+       // don't save maximized values
        this->showNormal();
        // save windows size and position
        LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h      (revision 14088)
+++ frontends/qt3/QtView.h      (working copy)
@@ -37,7 +37,7 @@
        Q_OBJECT
 public:
        /// create a main window of the given dimensions
-       QtView(unsigned int w, unsigned int h, bool isMax);
+       QtView(unsigned int w, unsigned int h, bool maximize);

        ~QtView();

Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C     (revision 14088)
+++ frontends/qt4/lyx_gui.C     (working copy)
@@ -228,12 +228,12 @@

 void start(string const & batch, vector<string> const & files,
-          unsigned int width, unsigned int height, int posx, int posy, bool isMax)
+          unsigned int width, unsigned int height, int posx, int posy, bool maximize)
 {
        // this can't be done before because it needs the Languages object
        initEncodings();

-       boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
+       boost::shared_ptr<QtView> view_ptr(new QtView(width, height, maximize));
        LyX::ref().addLyXView(view_ptr);

        QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C      (revision 14088)
+++ frontends/qt4/QtView.C      (working copy)
@@ -70,12 +70,12 @@
 } // namespace anon

-QtView::QtView(unsigned int width, unsigned int height, bool isMax)
+QtView::QtView(unsigned int width, unsigned int height, bool maximize)
        : QMainWindow(), LyXView(), commandbuffer_(0)
 {
        resize(width, height);

-       if(isMax)
+       if (maximize)
                this->setWindowState(Qt::WindowMaximized);

        mainWidget_ = this;
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h      (revision 14088)
+++ frontends/qt4/QtView.h      (working copy)
@@ -47,7 +47,7 @@
        Q_OBJECT
 public:
        /// create a main window of the given dimensions
-       QtView(unsigned int w, unsigned int h, bool isMax);
+       QtView(unsigned int w, unsigned int h, bool maximize);

        ~QtView();

Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14088)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
  * batch commands, and loading the given documents
  */
 void start(std::string const & batch, std::vector<std::string> const & files,
-           unsigned int width, unsigned int height, int posx, int posy, bool isMax);
+           unsigned int width, unsigned int height, int posx, int posy, bool maximize);

 /**
  * Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C  (revision 14088)
+++ lyx_main.C  (working copy)
@@ -307,7 +307,7 @@
                // initial geometry
                unsigned int width = 690;
                unsigned int height = 510;
-               bool isMax = false;
+               bool maximize = false;
                // first try lyxrc
                if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
                        width = lyxrc.geometry_width;
@@ -322,7 +322,7 @@
                        if (!val.empty())
                                height = convert<unsigned int>(val);
                        if (session().loadSessionInfo("WindowIsMaximized") == "yes")
-                               isMax = true;
+                               maximize = true;
                }
                // if user wants to restore window position
                int posx = -1;
@@ -335,7 +335,7 @@
                        if (!val.empty())
                                posy = convert<int>(val);
                }
-               lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
+               lyx_gui::start(batch_command, files, width, height, posx, posy, maximize);
        } else {
                // Something went wrong above
                quitLyX(false);

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14089 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoQt3/Qt4:
Peter Kümmel [Tue, 13 Jun 2006 08:05:00 +0000 (08:05 +0000)]
Qt3/Qt4:
   - don't save geometry values of the maximized lyx window
   - save/restore the maximized property of the lyx window

- fix changed lyx_gui::start interface for xform and gtk

Index: frontends/gtk/lyx_gui.C
===================================================================
--- frontends/gtk/lyx_gui.C (revision 14083)
+++ frontends/gtk/lyx_gui.C (working copy)
@@ -123,7 +123,7 @@

 void lyx_gui::start(string const & batch, std::vector<string> const & files,
-     unsigned int width, unsigned int height, int posx, int posy)
+     unsigned int width, unsigned int height, int posx, int posy, bool)
 {
  boost::shared_ptr<GView> view_ptr(new GView);
  LyX::ref().addLyXView(view_ptr);
Index: frontends/qt3/lyx_gui.C
===================================================================
--- frontends/qt3/lyx_gui.C (revision 14083)
+++ frontends/qt3/lyx_gui.C (working copy)
@@ -222,12 +222,12 @@

 void start(string const & batch, vector<string> const & files,
-    unsigned int width, unsigned int height, int posx, int posy)
+    unsigned int width, unsigned int height, int posx, int posy, bool isMax)
 {
  // this can't be done before because it needs the Languages object
  initEncodings();

- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
  LyX::ref().addLyXView(view_ptr);

  QtView & view = *view_ptr.get();
Index: frontends/qt3/QtView.C
===================================================================
--- frontends/qt3/QtView.C (revision 14083)
+++ frontends/qt3/QtView.C (working copy)
@@ -55,10 +55,13 @@

-QtView::QtView(unsigned int width, unsigned int height)
+QtView::QtView(unsigned int width, unsigned int height, bool isMax)
  : QMainWindow(), LyXView(), commandbuffer_(0)
 {
  resize(width, height);
+
+ if(isMax)
+ this->setWindowState(WindowMaximized);

  qApp->setMainWidget(this);

@@ -160,6 +163,9 @@

 void QtView::closeEvent(QCloseEvent *)
 {
+ LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
+ //don't save maximized values
+ this->showNormal();
  // save windows size and position
  LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
  LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
Index: frontends/qt3/QtView.h
===================================================================
--- frontends/qt3/QtView.h (revision 14083)
+++ frontends/qt3/QtView.h (working copy)
@@ -37,7 +37,7 @@
  Q_OBJECT
 public:
  /// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h);
+ QtView(unsigned int w, unsigned int h, bool isMax);

  ~QtView();

Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C (revision 14083)
+++ frontends/qt4/lyx_gui.C (working copy)
@@ -228,12 +228,12 @@

 void start(string const & batch, vector<string> const & files,
-    unsigned int width, unsigned int height, int posx, int posy)
+    unsigned int width, unsigned int height, int posx, int posy, bool isMax)
 {
  // this can't be done before because it needs the Languages object
  initEncodings();

- boost::shared_ptr<QtView> view_ptr(new QtView(width, height));
+ boost::shared_ptr<QtView> view_ptr(new QtView(width, height, isMax));
  LyX::ref().addLyXView(view_ptr);

  QtView & view = *view_ptr.get();
Index: frontends/qt4/QtView.C
===================================================================
--- frontends/qt4/QtView.C (revision 14083)
+++ frontends/qt4/QtView.C (working copy)
@@ -70,11 +70,14 @@
 } // namespace anon

-QtView::QtView(unsigned int width, unsigned int height)
+QtView::QtView(unsigned int width, unsigned int height, bool isMax)
  : QMainWindow(), LyXView(), commandbuffer_(0)
 {
  resize(width, height);

+ if(isMax)
+ this->setWindowState(Qt::WindowMaximized);
+
  mainWidget_ = this;

 // setToolButtonStyle(Qt::ToolButtonIconOnly);
@@ -182,11 +185,12 @@
 void QtView::closeEvent(QCloseEvent *)
 {
  // save windows size and position
- LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(width()));
- LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(height()));
+ LyX::ref().session().saveSessionInfo("WindowWidth", convert<string>(this->normalGeometry().width()));
+ LyX::ref().session().saveSessionInfo("WindowHeight", convert<string>(this->normalGeometry().height()));
+ LyX::ref().session().saveSessionInfo("WindowIsMaximized", (this->isMaximized() ? "yes" : "no"));
  if (lyxrc.geometry_xysaved) {
- LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(x()));
- LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(y()));
+ LyX::ref().session().saveSessionInfo("WindowPosX", convert<string>(this->normalGeometry().x()));
+ LyX::ref().session().saveSessionInfo("WindowPosY", convert<string>(this->normalGeometry().y()));
  }
  // trigger LFUN_LYX_QUIT instead of quit directly
  // since LFUN_LYX_QUIT may have more cleanup stuff
Index: frontends/qt4/QtView.h
===================================================================
--- frontends/qt4/QtView.h (revision 14083)
+++ frontends/qt4/QtView.h (working copy)
@@ -47,7 +47,7 @@
  Q_OBJECT
 public:
  /// create a main window of the given dimensions
- QtView(unsigned int w, unsigned int h);
+ QtView(unsigned int w, unsigned int h, bool isMax);

  ~QtView();

Index: frontends/xforms/lyx_gui.C
===================================================================
--- frontends/xforms/lyx_gui.C (revision 14083)
+++ frontends/xforms/lyx_gui.C (working copy)
@@ -256,7 +256,7 @@

 void start(string const & batch, vector<string> const & files,
-    unsigned int width, unsigned int height, int posx, int posy)
+    unsigned int width, unsigned int height, int posx, int posy, bool)
 {
  int const geometryBitmask =
  XParseGeometry(geometry, &posx, &posy, &width, &height);
Index: frontends/lyx_gui.h
===================================================================
--- frontends/lyx_gui.h (revision 14083)
+++ frontends/lyx_gui.h (working copy)
@@ -57,7 +57,7 @@
  * batch commands, and loading the given documents
  */
 void start(std::string const & batch, std::vector<std::string> const & files,
-           unsigned int width, unsigned int height, int posx, int posy);
+           unsigned int width, unsigned int height, int posx, int posy, bool isMax);

 /**
  * Enter the main event loop (\sa LyX::exec2)
Index: lyx_main.C
===================================================================
--- lyx_main.C (revision 14083)
+++ lyx_main.C (working copy)
@@ -307,6 +307,7 @@
  // initial geometry
  unsigned int width = 690;
  unsigned int height = 510;
+ bool isMax = false;
  // first try lyxrc
  if (lyxrc.geometry_width != 0 && lyxrc.geometry_height != 0 ) {
  width = lyxrc.geometry_width;
@@ -320,6 +321,8 @@
  val = session().loadSessionInfo("WindowHeight");
  if (!val.empty())
  height = convert<unsigned int>(val);
+ if (session().loadSessionInfo("WindowIsMaximized") == "yes")
+ isMax = true;
  }
  // if user wants to restore window position
  int posx = -1;
@@ -332,7 +335,7 @@
  if (!val.empty())
  posy = convert<int>(val);
  }
- lyx_gui::start(batch_command, files, width, height, posx, posy);
+ lyx_gui::start(batch_command, files, width, height, posx, posy, isMax);
  } else {
  // Something went wrong above
  quitLyX(false);

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14088 a592a061-630c-0410-9148-cb99ea01b6c8

18 years agoDeleted because not used anywhere.
Abdelrazak Younes [Sun, 11 Jun 2006 21:45:01 +0000 (21:45 +0000)]
Deleted because not used anywhere.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14079 a592a061-630c-0410-9148-cb99ea01b6c8