anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-24 08:58:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,521 Commits 30 Branches 171 Tags 681 MiB
bbc587ee9a
Commit Graph

7748 Commits

Author SHA1 Message Date
Peter Kümmel
bbc587ee9a 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
 2006-06-13 08:24:43 +00:00
Peter Kümmel
226acfcbab 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
 2006-06-13 08:05:00 +00:00
Abdelrazak Younes
7efc6e9e0a Deleted because not used anywhere. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14079 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-11 21:45:01 +00:00
Abdelrazak Younes
5c4d89d816 Simple optimisation: reuse current QPainter if no there's no change in settings. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14078 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-11 21:22:36 +00:00
Edwin Leuven
73a4be7143 more cleanup: some formatting and handle mouse events in their event handlers (and not in event()) 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14072 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-11 14:28:10 +00:00
Peter Kümmel
df04880e55 fix crash on startup under windows by avoiding the call 
setlocale(LC_MESSAGES, ...

scons tests on LC_MESSAGES there is also an m4 file for LC_MESSAGES
so I think all build systems handle HAVE_LC_MESSAGES.



Index: src/messages.C
===================================================================
--- src/messages.C      (revision 14066)
+++ src/messages.C      (working copy)
@@ -90,7 +90,10 @@
                : lang_(l)
        {
                if ( lang_.empty() ) {
-                       char const * lc_msgs = setlocale(LC_MESSAGES, NULL);
+                       char const * lc_msgs = 0;
+#ifdef HAVE_LC_MESSAGES
+                       lc_msgs = setlocale(LC_MESSAGES, NULL);
+#endif
                        lang_ = lc_msgs ? lc_msgs : "";
                }
                // strip off any encoding suffix, i.e., assume 8-bit po files
@@ -117,8 +120,9 @@
                                        lang = "C";
                        }
                }
-
+#ifdef HAVE_LC_MESSAGES
                char const * lc_msgs = setlocale(LC_MESSAGES, lang_.c_str());
+#endif
                // setlocale fails (returns NULL) if the corresponding locale
                // is not installed.
                // On windows (mingw) it always returns NULL.
@@ -164,7 +168,9 @@
                boost::smatch sub;
                if (regex_match(translated, sub, reg))
                        translated = sub.str(1);
+#ifdef HAVE_LC_MESSAGES
                setlocale(LC_MESSAGES, lang.c_str());
+#endif
                setlocale(LC_CTYPE, oldCTYPE.c_str());
                return translated;
        }


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14067 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-10 07:05:21 +00:00
Martin Vermeer
85dc2d3ebd * insetbox.h: add noFontChange() == true to prevent LaTeX error for 
multi-paragraph box insets



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14056 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-09 12:10:49 +00:00
Abdelrazak Younes
a9390a6b8d Fix Windows crash on exit with "static LQApplication" 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14055 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-06-09 09:37:51 +00:00
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
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
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
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
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
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
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
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
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
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
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
Abdelrazak Younes
a7c2820c49 Enable Font width caching. 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13931 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-25 22:37:01 +00:00
Georg Baum
d544373734 Change the semantics of 'none' and 'auto' viewers/editors: 'none' means now 
"Don't view/edit this format", and 'auto' means "Use the default viewer/editor".
	* src/format.C
	(fixCommand): Change semantics: "none" is equal to "", and "auto"
	is removed if canAutoOpenFile returns false.

	* src/frontends/xforms/FormPreferences.C
	(FormPreferences::SpellOptions::apply): "none" -> ""

	* src/lyxrc.C
	(LyXRC::read): "none" -> ""

	* lib/doc/Customization.lyx: Document the autoopen feature

	* lib/configure.py
	(checkProg): add optional not_found argument, defaulting to 'none'
	(checkViewer): new, equivalent to checkProg with not_found = 'auto'
	(checkFormatEntries): call checkViewer instead of checkProg for
	viewers and editors


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13929 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-25 11:57:22 +00:00
Abdelrazak Younes
04e8d1e65b qt3/qfont_loader.h: added comment about pointer reference. 
qt4/qfont_loader.h: reverted to last version and added comment about pointer reference.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13927 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-25 10:02:01 +00:00
Jürgen Spitzmüller
f62b8f095d * BufferView_pimpl.C (getStatus): 
Disable saving of bookmarks in mathed for it is not yet supported
  	and makes LyX crash (bug 2597)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13911 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-22 14:28:43 +00:00
Jürgen Spitzmüller
a6c099326c * insettabular.C (doDispatch): 
set cursor after mouse (button 3) press
	(re-fix bug 2526).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13909 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-22 14:19:34 +00:00
Jürgen Spitzmüller
6116f95f83 * insettabular.C (doDispatch): 
do not mark the cursor undispatched after mouse (button 3) press
	(prevents the cursor from leaving the tabular when opening the 	
	dialog).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13906 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-22 13:11:57 +00:00
Jürgen Spitzmüller
645f5e83fb * insettabular.C (doDispatch): 
fix crash due to invalidated
	cursor after insertAciiString (bug 2603).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13905 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-22 10:19:27 +00:00
Georg Baum
1b99ba9a57 forgot this in the last patch 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13899 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-22 09:21:43 +00:00
Georg Baum
dbb03f91f0 * src/insets/insetgraphics.C 
(InsetGraphics::prepareFile): Rename file in the temp dir if the
	extension does not match the format (bug 2235)


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13898 a592a061-630c-0410-9148-cb99ea01b6c8
 2006-05-22 09:15:33 +00:00