anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-17 16:34:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,403 Commits 31 Branches 172 Tags 618 MiB
020af57832
Commit Graph

14403 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peter Kümmel
8a552374b9 - remove usage of qt3 support functions. 
- undef QT3_SUPPORT until the QT3_SUPPORT-logic will be inverted.
- QLocale::system().name() returns e.g de_DE but the Qt file name is 
  qt_de.


Index: frontends/qt4/lyx_gui.C
===================================================================
--- frontends/qt4/lyx_gui.C     (revision 14043)
+++ frontends/qt4/lyx_gui.C     (working copy)
@@ -9,6 +9,8 @@
  * Full author contact details are available in file CREDITS.
  */

+#undef QT3_SUPPORT
+
 #include <config.h>

 #include "lyx_gui.h"
@@ -55,6 +57,8 @@
 #include <QEventLoop>
 #include <QTranslator>
 #include <QTextCodec>
+#include <QLocale>
+#include <QLibraryInfo>

 using lyx::support::ltrim;
 using lyx::support::package;
@@ -167,19 +171,22 @@

        // install translation file for Qt built-in dialogs
        // These are only installed since Qt 3.2.x
-       QTranslator qt_trans(0);
-       if (qt_trans.load(QString("qt_") + QTextCodec::locale(),
-                         qInstallPathTranslations())) {
+       QTranslator qt_trans;
+       QString language_name = QString("qt_") + QLocale::system().name();
+       language_name.truncate(5);
+       if (qt_trans.load(language_name,
+               QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+       {
                qApp->installTranslator(&qt_trans);
                // even if the language calls for RtL, don't do that
-               qApp->setReverseLayout(false);
+               qApp->setLayoutDirection(Qt::LeftToRight);
                lyxerr[Debug::GUI]
                        << "Successfully installed Qt translations for locale "
-                       << QTextCodec::locale() << std::endl;
+                       << fromqstr(language_name) << std::endl;
        } else
                lyxerr[Debug::GUI]
                        << "Could not find  Qt translations for locale "
-                       << QTextCodec::locale() << std::endl;
+                       << fromqstr(language_name) << std::endl;

 /*#ifdef Q_WS_MACX
        // These translations are meant to break Qt/Mac menu merging
@@ -260,9 +267,7 @@
        // During screen update/ redraw, this method is disabled to
        // prevent keyboard events being handed to the LyX core, where
        // they could cause re-entrant calls to screen update.
-#if QT_VERSION >= 0x030100
-       qApp->processEvents(QEventLoop::ExcludeUserInput);
-#endif
+       qApp->processEvents(QEventLoop::ExcludeUserInputEvents);
 }



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14046 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-08 14:27:44 +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
Georg Baum
716626aa0b app -> qApp, forgot this with the last patch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14038 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-08 06:53:11 +00:00
Georg Baum
042d5a0242 Fix crash on exit (bug 2549) by correct usage of QApplication 
* src/lyx_cb.C
	(quitLyX): lyx_gui::exit takes now an argument

	* src/frontends/{gtk,xforms}/lyx_gui.C
	(lyx_gui::parse_init): rename to lyx_gui::exec and call LyX::exec2
	(void lyx_gui::exit): add exit status argument

	* src/frontends/qt{3,4}/lyx_gui.C
	(cleanup): new function for pointer cleanup
	(lyx_gui::parse_init): rename to lyx_gui::exec and call LyX::exec2,
	turn static variables into automatic variables
	(void lyx_gui::exit): add exit status argument
	(start): Use cleanup()
	(exit): ditto

	* src/frontends/lyx_gui.h
	(parse_init): remove
	(exec): new
	(exit): Take exist status argument

	* src/lyx_main.[Ch]
	(LyX::priv_exec): split into LyX::priv_exec and LyX::exec2

	* src/lyx_main.C
	(lyx_exit): New, choose the right exit function
	(showFileError): call lyx_exit
	(LyX::queryUserLyXDir): ditto
	(LyX::init): ditto
	(LyX::priv_exec): ditto
	(LyX::priv_exec): Replace want_gui by lyx_gui::use_gui
	(LyX::priv_exec): replace lyx_gui::parse_init by lyx_gui::exec and
	exec2
	(LyX::init): Replace gui argument by lyx_gui::use_gui


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14036 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-07 20:08:37 +00:00
Jean-Marc Lasgouttes
459303729c * src/bufferparams.h: make author_map use an unsigned index, to avoid 
a warning.

	* src/text.C (readParToken): handle \change_inserted and
	\change_deleted tokens with wrong author index (bug 2614).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14028 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-07 17:05:25 +00:00
Angus Leeming
6bdbfecce3 Add Peter Kümmel to our list of contributers. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14024 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-07 14:14:38 +00:00
John Spray
84d0c509b4 Text encoding hack and removal of cited-keys searching 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14023 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-06 17:47:28 +00:00
John Spray
87ce9b7647 escape special characters in strings passed to gtk as markup 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14022 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-06 16:49:23 +00:00
Georg Baum
56cd160c39 compile fix for OS X 
* src/frontends/qt4/QRef.C: s/ControlRef/lyx::frontend::ControlRef/

	* src/frontends/qt4/QRef.h: ditto

	* src/frontends/qt4/Dialogs.C:
	(Dialogs::build): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14020 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-06 10:10:11 +00:00
Angus Leeming
4401521a45 Add Joost to our list of contributers. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14016 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-06 08:05:05 +00:00
Georg Baum
5bb791e841 * lib/lyx2lyx/Makefile.am: Add missing file lyx_1_5.py 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14013 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-05 19:24:18 +00:00
Georg Baum
d98eaedac7 * src/frontends/qt4/QCitation.h: Fix compiler warning about /* 
inside a comment


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14009 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-05 16:09:56 +00:00
Abdelrazak Younes
4f9ddcbcb4 remove QT3_SUPPORT macro dependency by Peter Kummel (syntheticpp@gmx.net) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14001 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-04 21:15:33 +00:00
Abdelrazak Younes
52557ce331 remove QT3_SUPPORT macro dependency by Peter Kummel (syntheticpp@gmx.net) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14000 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-04 20:50:41 +00:00
Abdelrazak Younes
f9f72cfa0c remove QT3_SUPPORT macro dependency by Peter Kummel (syntheticpp@gmx.net) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13999 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-04 20:49:09 +00:00
Georg Baum
8cb28fed33 * lib/configure.py: Add tgif->png and tgif->ppm converters 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13997 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-04 09:58:19 +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
Georg Baum
e8bb11969d * src/frontends/qt3/lyx_gui.C 
(LQApplication): remove empty destructor

	* src/frontends/qt4/lyx_gui.C
	(LQApplication): remove empty destructor


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13992 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-03 14:18:33 +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
Edwin Leuven
924d8f471c small cleanup: we don't need to store the funcrequest 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13980 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-01 20:34:22 +00:00
Edwin Leuven
40783d2ebb don't crash: apply values before closing 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13979 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-01 20:33:37 +00:00
Jean-Marc Lasgouttes
1d14cdd0ea 2006-06-01 Panayotis Papasotiriou <papasot@physics.upatras.gr> 
* Makefile.am:
	* templates/ijmpc.lyx: 
	* layouts/ijmpc.layout: new textclass for International Journal of
	Modern Physics C. 

	* templates/ijmpd.lyx
	* layouts/ijmpd.layout: update.

	* LaTeXConfig.lyx.in:
	* Extended.lyx: update for ijmpc/d textclasses.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13977 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-01 13:13:16 +00:00
Lars Gullik Bjønnes
b08b0a75a1 add some missing files 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13976 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-01 07:23:46 +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
98a75b6456 replace if/else with switch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13974 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-31 14:46:01 +00:00
Edwin Leuven
2d73110e2c make sure we get the correct path in windows 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13973 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-31 14:28:29 +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
Jean-Marc Lasgouttes
7bc451a1ee * src/intl.C (InitKeyMapper): reset kbmap file names if the files 
could not be read (bug 2604).



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13971 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-31 10:34:30 +00:00
Jean-Marc Lasgouttes
a719e89ffe src/MenuBackend.C (expandFormats): add default case to switch; handle 
UpdateFormat like the others cases.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13969 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-30 13:48:27 +00:00
Abdelrazak Younes
c4edb019f5 fix "posx, posx" typo. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13968 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-30 13:39:34 +00:00
Jean-Marc Lasgouttes
0fbd5c2588 * src/frontends/*/lyx_gui.C: 
* src/frontends/lyx_gui.h: change width and height parameters to unsigned int.

* src/frontends/xforms/lyx_gui.C: compilation fix.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13967 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-30 10:20:35 +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
5d38575647 * src/support/os_unix.C (canAutoOpenFile, autoOpenFile): add support for Mac 
OS X.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13961 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 16:41:51 +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
Jürgen Spitzmüller
6fd2366d9c * src/LaTeX.C (run): 
fix typo from r13950

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13954 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 15:51:12 +00:00
Bo Peng
f9c7473ed3 Move window width/height/posx/posy from frontends to lyx_main.C, from Bo Peng (ben.bob@gmail.com) 
* src/frontends/ALLFRONTENDS/lyx_gui.C: use passed width/height/posx/posy in lyx_gui::start
	* src/frontends/lyx_gui.h: prototype change for lyx_gui::start
	* src/lyx_main.C: determine windows size and position from lyxrc or session.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13953 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 15:11:19 +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
a21c78f25b Some MSVC2003/2005 compatibility fixes, from Bo Peng (ben.bob@gmail.com) 
* src/support/lyxsum.C: fix HAVE_DECL_ISTREAMBUF_ITERATOR
	* src/support/mkdir.C: add direct.h for windows
	* src/support/forkedcall.C: add cerrno under windows
	* src/support/tempname.C: define S_IRUSR and S_IWUSR
	* src/support/package.C.in: define PATH_MAX=256



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13951 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 14:56:08 +00:00
Jürgen Spitzmüller
28fa2c0efa fix bug 2623: 
* lib/layouts/memoir.layout:
	add ProvidesMakeindex

* src/LaTeX.C (run):
	rerun latex im idx file is empty (needed by memoir)
	fix typo in comment
* src/LaTeXFeatures.C (getPackages):
	whitespace

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13950 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 14:49:08 +00:00
Abdelrazak Younes
2485efbf75 additional comments related to rev 13948 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13949 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-29 07:38:09 +00:00
Abdelrazak Younes
d1d896e23c Fix hang on exit under Windows. 
TODO: reorganize this code. In particular make sure that this advise from Qt documentation is respected:

Since the QApplication object does so much initialization, it must be created before any other objects related to the user interface are created.

Right now this is not the case. For example, "FontLoader::initFontPath()" is called before the QApplication creation. Moreover, I suspect that a number of global variables contains Qt object that are initialized before the passage through parse_init(). This might also explain the message displayed by Qt that caused the hanging:

QObject::killTimer: timers cannot be stopped from another thread



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13948 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-28 22:10:33 +00:00
Martin Vermeer
32a51961ae Slight improvement to caption inset 
* insetcaption.C
	(InsetCaption::setLabel): added
	(InsetCaption::metrics): modified
	(InsetCaption::draw): modified

	* insetcaption.h
	(descendable): added
	(setCount): added



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13946 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-28 17:02:57 +00:00
Abdelrazak Younes
9614a1d698 Fix for Qt4 crash on exit under linux by Georg Baum and myself. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13943 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-27 19:58:02 +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
415e308cf4 * src/lyxsocket.C 
(LyXServerSocket::~LyXServerSocket): Don't try to unregister and
	close fd_ if the socket is disabled (avoids crash on win, from Peter
	KÃŒmmel)
	(LyXServerSocket::~LyXServerSocket): Check the return value of close()
	(LyXDataSocket::~LyXDataSocket): ditto


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13941 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-27 13:39:11 +00:00
Georg Baum
440ebe6385 * lib/configure.py: fix typo 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13940 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-27 08:31:22 +00:00