Peter Kümmel
cd53c67f79
load and restore correct windows postion
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14102 a592a061-630c-0410-9148-cb99ea01b6c8
2006-06-14 14:32:39 +00:00
Peter Kümmel
c02f6409ec
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
2006-06-14 14:23:25 +00:00
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
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
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
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
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
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
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
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
Abdelrazak Younes
3efac59557
qt4 optimisation:
...
* qfont_loader.h: enable the font caching
* QWorkArea: disable intermediate QImage caching, use QPixmap directly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13893 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-21 08:49:02 +00:00
Georg Baum
5b83287abe
* src/format.[Ch]
...
(document_): new flag, telling whether this is a document format and
we want to show this format in the export and view menus
(documentFormat): accessor for document_
* src/format.h: Add some documentation
* src/frontends/qt3/QPrefsDialog.C
(QPrefsDialog::QPrefsDialog): handle new documentCB checkbox
(QPrefsDialog::switch_format): ditto
(QPrefsDialog::updateFormatsButtons): ditto
(QPrefsDialog::new_format): ditto
(QPrefsDialog::modify_format): ditto
* src/frontends/qt3/ui/QPrefFileformatsModule.ui: Add documentCB checkbox
* src/frontends/qt4/QPrefsDialog.C
(QPrefsDialog::QPrefsDialog): handle new documentCB checkbox
(QPrefsDialog::switch_format): ditto
(QPrefsDialog::updateFormatsButtons): ditto
(QPrefsDialog::new_format): ditto
(QPrefsDialog::modify_format): ditto
* src/frontends/qt4/ui/QPrefFileformatsUi.ui: Add documentCB checkbox
* src/frontends/xforms/FormPreferences.C
(FormPreferences::Formats::build): handle new check_document checkbox
(FormPreferences::Formats::input): ditto
(FormPreferences::Formats::Add): ditto
(FormPreferences::Formats::Browser): ditto
* src/frontends/xforms/forms/form_preferences.fd: Add check_document
checkbox
* src/lyxrc.C
(LyXRC::read): Remove compatibility code for 1.3 \format entries.
Read the new format flags (but don't require them for 1.4
compatibility)
(LyXRC::write): Write the new format flags
* src/MenuBackend.C
(expandFormats): Remove the hardcoded exception for image formats
and use Format::isDocument() instead
* lib/doc/Customization.lyx: Document auto viever/editor and the
"document format" flag
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13887 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-20 12:03:40 +00:00
Abdelrazak Younes
f8918b0859
* QPrefsDialog.[Ch]: Split up of QPrefsDialog into different modules (one per .ui file)
...
* panelstack.C: automatic creation of parent category if not already created.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13886 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-20 11:49:53 +00:00
Jean-Marc Lasgouttes
b5987c69a1
* src/frontends/qt3/qfontloader.C (initFontPath, ~FontLoader):
...
* src/frontends/qt4/qfontloader.C (initFontPath, ~FontLoader): add fonts in
lyxdir/fonts to system fonts in windows; remove them in destructor.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13877 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-20 08:21:58 +00:00
Edwin Leuven
cd457e07c8
make the formats/converters panels in the pref dialog set the correct parameters.
...
atm this does not work because it depends on the order in which these entries were added.
now the order is alphabetical and things are messed up.
the attached patch adds the nr of the format/converter to the listwidgetitem as a type and uses that to get to the right details
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13864 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-18 11:14:10 +00:00
Abdelrazak Younes
4a8ffce850
Small cleanup recommended by Lars Gullik Bjønnes:
...
Can you move the SUBDIRS var back to the top of the file pleae.
Also EXTRA_DIST should be at the top.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13863 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-18 09:37:35 +00:00
Abdelrazak Younes
995da7bafc
Qt4 compilation speedup patch by Bo Peng and me.
...
* configure.ac: removed frontends/qt4/moc compilation.
* frontends/qt4/: moc files (*_moc.cpp) are now included at the end of relevant source file (*.C)
* SConscript: adapted to "moc included in .C file" change.
* frontends/qt4/Makefile.am: adapted to "moc included in .C file" change.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13860 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-18 08:51:12 +00:00
Georg Baum
e6a167ea5e
Add \overset and \underset to math panel (bug 2533):
...
* lib/images/math/underset.xpm: new
* lib/images/math/overset.xpm: new
* lib/Makefile.am: add new files
* src/frontends/controllers/ControlMath.C
(latex_deco[]): add overset and underset
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13858 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-18 07:10:56 +00:00
Lars Gullik Bjønnes
98f299e223
also add the qt4 setup to SConstruct
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13826 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-10 18:31:13 +00:00
Lars Gullik Bjønnes
5e3b997b85
Remove the now superseeded SConscript files, and some small missing parts to SConstruct
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13825 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-10 18:05:12 +00:00
Bo Peng
97e53edb81
Make scons work on mingw/windows, from Bo Peng (ben.bob@gmail.com)
...
* SConstruct: force the use of g++ under windows, and use the right libraries
* config/qt4.py: check QtGui4 etc as well.
* src/SConscript: link to the right libraries
* src/tex2lyx/SConscript: use the right libraries
* src/frontends/qt3/SConscript: manually moc .h files under windows
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13814 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-09 13:01:45 +00:00
Bo Peng
4b5fae61d3
Some fixes to the scons-based building sytem, from Bo Peng (ben.bob@gmail.com)
...
* SConstruct: add extra_inc_path1, fix mingw logged spawn, try to handle QtCore4 etc
* src/SConscript: remove lyx_base library
* src/frontends/qt4/SConscript: remove some extra files
* Move scons_utils.py and qt4.py to config directory
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13813 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-08 21:03:01 +00:00
Michael Schmitt
1396ade8b1
fix LFUN enum values (some of them were broken by r13801)
...
adjust some commands according to the LyX naming conventions
(toggle-tooltip => tooltip-toggle, *-change(s) => change(s)-*)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13811 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-08 18:09:19 +00:00
John Spray
39976d4a74
Glade tweakage: make OK button default in citation dialog
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13810 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-08 14:47:03 +00:00
Edwin Leuven
f92abd5576
replaced last convenience class in iconpallete
...
browsebox is not build anymore and commented out in bulletsmodule
bullets are disabled in documentdialog: wasn't working before either
remove qt3support!
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13809 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-08 11:44:37 +00:00
Bo Peng
7168ce58b5
scons-based build system, by Bo Peng (ben.bob@gmail.com)
...
* SConstruct: main SConstruct file
* scons_utils.py: utility functions
* qt4.py: qt4 support is not yet official, and I have to patch this file
* src/SConscript
* src/insets/SConscript
* src/graphics/SConscript
* src/mathed/SConscript
* src/frontends/qt3/SConscript
* src/frontends/qt4/SConscript
* src/frontends/SConscript
* src/frontends/controllers/SConscript
* src/support/SConscript
* src/client/SConscript
* src/tex2lyx/SConscript
* boost/libs/SConscript
* boost/libs/signals/src/SConscript
* boost/libs/filesystem/src/SConscript
* boost/libs/iostreams/src/SConscript
* boost/libs/regex/src/SConscript
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13807 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-07 22:44:54 +00:00
Georg Baum
b6c3478eda
Implement GUI for fixed size math delimiters (by Enrico Forestieri and me):
...
* src/lfuns.h
(enum kb_action): New lfun LFUN_MATH_BIGDELIM
* src/LyXAction.C
(void LyXAction::init): New lfun LFUN_MATH_BIGDELIM
* src/mathed/math_nestinset.C
(void MathNestInset::doDispatch): remove debug message
(void MathNestInset::doDispatch): remove LFUN_MATH_DELIM test for
multiple cells (now in getStatus)
(void MathNestInset::doDispatch): Handle LFUN_MATH_BIGDELIM
(bool MathNestInset::getStatus): Disable LFUN_MATH_DELIM and
LFUN_MATH_BIGDELIM when the selection spans multiple cells
* src/frontends/qt3/ui/QDelimiterDialogBase.ui
Added a combobox for selecting delimiter size.
* src/frontends/qt3/QDelimiterDialog.[Ch]
(fix_name, QDelimiterDialog, insertClicked, size_selected):
Allow for fixed size delimiters.
* src/frontends/gtk/GMathDelim.C: Add FIXME commnent for fixed size
delimiters
* src/frontends/qt4/QDelimiterDialog.C: ditto
* src/frontends/xforms/FormMathsDelim.C: ditto
* src/frontends/controllers/ControlMath.[Ch]:
Added dispatchBigDelim() to deal with fixed size delimiters.
* src/text3.C
(void LyXText::dispatch): Handle LFUN_MATH_BIGDELIM
(bool LyXText::getStatus): ditto
* src/ToolbarBackend.C
(string const ToolbarBackend::getIcon): Handle LFUN_MATH_BIGDELIM
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13806 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-07 10:51:19 +00:00
Edwin Leuven
123cc28dba
getting rid of qt4 convenience classes:
...
Index: src/frontends/qt4/QCitationDialog.C
Index: src/frontends/qt4/QCitationDialog.h
Index: src/frontends/qt4/ui/QCitationFindUi.ui
Index: src/frontends/qt4/QPrefsDialog.C
Index: src/frontends/qt4/QPrefsDialog.h
Index: src/frontends/qt4/ui/QPrefColorsUi.ui
Index: src/frontends/qt4/ui/QPrefCopiersUi.ui
Index: src/frontends/qt4/ui/QPrefFileformatsUi.ui
Index: src/frontends/qt4/ui/QPrefConvertersUi.ui
Index: src/frontends/qt4/QParagraphDialog.C
no more qt3 drag n drop:
Index: src/frontends/qt4/QWorkArea.C
as discussed on list:
Index: src/frontends/qt4/QLyXKeySym.C
Index: src/frontends/qt4/QLyXKeySym.h
bit of repair here:
Index: src/frontends/qt4/ui/QAboutUi.ui
Index: src/frontends/qt4/QAbout.C
bit of cleaning here (no separate color column, but rather icon)
Index: src/frontends/qt4/QBranches.C
got rid of this altogether:
Index: src/frontends/qt4/qcoloritem.C
Index: src/frontends/qt4/qcoloritem.h
Index: src/frontends/qt4/Makefile.am
+ filedialog to qt4 one
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13805 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-07 10:20:43 +00:00
Abdelrazak Younes
aabf2d6d5a
Remove <climits> for pch.h as this header is not used anywhere in the qt4 frontend.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13804 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-06 14:41:23 +00:00
Abdelrazak Younes
668beb6c25
Remove "limits.h" for pch.h as this header is not used anywhere in the qt4 frontend.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13803 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-06 13:58:41 +00:00
André Pönitz
da65e2b7fb
rename LFUN enum values according to their command (as used in th minibuffer/bind files
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13801 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-05 20:23:12 +00:00
Edwin Leuven
1032cc5ae8
getting rid of even more qt3 convenience classes and unused headers...
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13796 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-04 07:31:46 +00:00
Edwin Leuven
3c4e073313
get rid of convenience classes in the following dialogs (and associated implementation files):
...
Index: src/frontends/qt4/ui/QErrorListUi.ui
Index: src/frontends/qt4/ui/QExternalUi.ui
Index: src/frontends/qt4/ui/QSendtoUi.ui
Index: src/frontends/qt4/ui/QSpellcheckerUi.ui
Index: src/frontends/qt4/ui/QThesaurusUi.ui
Index: src/frontends/qt4/ui/QTexinfoUi.ui
Index: src/frontends/qt4/ui/QRefUi.ui
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13794 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-03 19:51:15 +00:00
Edwin Leuven
ee3e1bbba7
Replace Q3ListBox with QListWidget:
...
* QBibtexDialog.C
* QBibtex.C
* QBibtexUi.ui
* QBibtexAddUi.ui
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13791 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-02 19:17:59 +00:00
Georg Baum
9e3c2e7cb9
* src/frontends/qt3/moc/Makefile.am: Remove extra qt3 include path
...
* src/frontends/qt3/ui/moc/Makefile.am: ditto
* src/frontends/qt3/ui/*.ui: Add extra includes to the
implementation rather than the declaration
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13789 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-02 13:07:38 +00:00
Georg Baum
f5ca956ab1
Convert ui files to qt3 format:
...
* src/frontends/qt3/moc/Makefile.am: Add src/frontends/qt3 to includes
* src/frontends/qt3/ui/moc/Makefile.am: ditto
* src/frontends/qt3/ui/*.ui: Convert to qt3 format, no functional
change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13787 a592a061-630c-0410-9148-cb99ea01b6c8
2006-05-01 09:16:50 +00:00
Abdelrazak Younes
ff83a99e94
* QToc.[Ch], QTocDialog.[Ch]: adaptation to ControlToc changes in r13772
...
* TocModel.[Ch]: small cleanup + eol-style set to native
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13774 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-28 09:16:48 +00:00
Martin Vermeer
2219197cfe
Brown paper bag for r13772
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13773 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-28 07:45:37 +00:00
Martin Vermeer
be0dd89019
Change capitalization for outline (DOWN -> Down etc.)
...
* BufferView_pimpl.C
(BufferView::Pimpl::dispatch): change
* frontends/controllers/ControlToc.C
(ControlToc::outline): replace by outlineUp ... outlineOut
* toc.[Ch]
(outline): change
* frontends/qt3/QToc.C
(QToc::set_depth): change
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13772 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-28 07:28:10 +00:00
Bo Peng
7cff3d5d5e
Add lyxrc.use_lastfilepos and load_session to the qt4 preference dialog.
...
* src/frontends/qt4/QPrefsDialog.C, connect checkboxes to lyxrc
* src/frontends/qt4/ui/QPrefUi.ui, add two checkboxes.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13766 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-27 18:19:14 +00:00
Martin Vermeer
71f356c372
Outlining improvements/fixes
...
* LyXAction.C
(LyXAction::init): add LFUN_OUTLINE_(UP|DOWN|IN|OUT)
* BufferView_pimpl.C
(BufferView::Pimpl::getStatus):
(BufferView::Pimpl::dispatch): handling of new LFUNS
* frontends/controllers/ControlToc.C
(ControlToc::canOutline): modify dispatch logic
* lfuns.h
(kb_action): add LFUNs
* toc.[Ch]
(outline): changes
* TocBackend.h: modifify == operator for Item
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13751 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-26 17:43:03 +00:00
Bo Peng
1d1df1a5f1
Add lyxrc.use_lastfilepos and load_session to the preference dialog. Bo Peng (ben.bob@gmail.com)
...
* src/frontends/qt3/QPrefs.C, QPrefsDialog.C, ui/QPrefUIModule.ui: add two checkboxes
* src/lyxrc.C: turn off load_session by default (since we now can turn it on)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13741 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-25 22:22:11 +00:00
Georg Baum
4fd1ce3af6
undo compilation fix
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13734 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-24 15:07:24 +00:00
John Spray
5b92f48666
Add the const-ized functions that GExternal needs.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13733 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-24 14:22:32 +00:00
Georg Baum
7855aa5b13
make GExternal.C compile. GTK people, please fix this!!
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13732 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-24 14:17:16 +00:00
Lars Gullik Bjønnes
eefc9ad640
* Rename src/frontends/qt2 to src/frontends/qt3,
...
update users of the dir accordingly.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13731 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-24 13:48:24 +00:00
Lars Gullik Bjønnes
69567e26be
change string "qt2" to "qt4"
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13727 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-24 13:25:50 +00:00
Abdelrazak Younes
f8c8b75706
simple two one-liner fixes to show all toc items.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13716 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-23 09:25:25 +00:00
Abdelrazak Younes
8c0bd3a77b
* TocBackend.[Ch]: new files defining class TocBackend. This class contains adapted code from former toc.C
...
* toc.[Ch]:
- rewritten to take advantage of new TocBackend class. The toc
cache is implemented as a static variable:
static map<Buffer const *, lyx::TocBackend> toc_backend_;
* buffer_funcs.C:
updateLabels(Buffer const & buf) now calls
"lyx::toc::updateToc(buf);"
* pariterator.h: added default constructor
ParConstIterator(): DocIterator() {}
* insetfloat.C: added pit parameter to TocItem construction
* insetwrap.C: added pit parameter to TocItem construction
* MenuBackend.C: use a const ref instead of a copy of TocList
* ControlToc.[Ch]: optimisation of the API by using const reference instead of copy.
* qt4/TocPanel.[Ch]:
- optimisation of the API by using const reference instead of
copy
- directly use of TocBackend::TocIterator instead of identification by paragraph contents.
* qt4/QToc.C:
- optimisation of the API by using const reference instead of
copy
- makes use of TocBackend::Item::uid()
* qt2/QToc.C:
- use TocItem::depth() and TocItem::str() instead of public member access.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13713 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-22 18:48:28 +00:00
Martin Vermeer
11145e20eb
Grey out outlining movement buttons for non-ToC
...
* qt2/QTocDialog.[Ch]: Add enableButtons
* qt2/QToc.[Ch]
(QToc::build_dialog):
(QToc::updateType):
(QToc::updateToc):
(QToc::updateToc):
(QToc::set_depth): Change update logic
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13709 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-21 22:51:39 +00:00
Abdelrazak Younes
fc57e5e4ad
Two ways toc navigation:
...
* Toc.[Ch]: new function getCurrentTocItem()
* ControlToc.[Ch]: new function getCurrentTocItem()
* QToc.[Ch]: new function getCurrentIndex()
* QTocDialog.C
- QTocDialog::update() calls QToc::getCurrentIndex()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13695 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-19 14:48:22 +00:00
John Spray
70fb7833dd
Commit Bernhard Reiter's implementation of GExternal
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13694 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-19 09:13:54 +00:00
John Spray
35948be234
Changes to External controller for GTK implementation
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13693 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-19 09:11:25 +00:00
Abdelrazak Younes
9db70c5346
* ControlToc.[Ch]
...
- bool ControlToc::canOutline(): new method to test if outline is possible.
* TocModel: new class
* QToc is now the controller (inheriting ControlToc directly) and the model (using TocModel)
* QTocDialog is now only the view (inheriting Dialogs::View directly)
* Dialogs.C: updated toc controller and view correspondingly
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13692 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-18 09:57:47 +00:00
Georg Baum
4700431096
* src/frontends/qt2/QWorkArea.C: fix compilation on OS X
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13690 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-17 16:44:37 +00:00
Abdelrazak Younes
f6bcac7285
* src/buffer_funcs.[Ch]
...
- updateCounters renamed to updateLabels
- void updateLabels(Buffer const & buf,
ParIterator & it): new convenience function
- void updateLabels(Buffer const & buf,
ParIterator & from, ParIterator & to): new convenience function
- setCounter renamed to setLabel
- bool tryToUpdateCurrentLabel(Buffer const & buf,
ParIterator & it): new method
- needsUpdateCounters: deleted
* src/BufferView_pimpl.C
* src/CutAndPaste.C
* src/frontends/controllers/ControlDocument.C
* src/lyxfunc.C
* src/text.C
* src/text2.C
* src/text3.C
- fixed the calls to updateLabels
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13689 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-16 14:19:25 +00:00
Jürgen Spitzmüller
a90ee19486
* src/frontends/qt4/QTocDialog.C: Hide the pointless QHeader
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13688 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-16 08:33:30 +00:00
Jürgen Spitzmüller
9d8aadcc64
* src/frontends/qt4/QTocDialog.C
...
(updateToc, populateItem): fix the logic of depth calculation.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13687 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 17:56:20 +00:00
Jürgen Spitzmüller
436adb1605
* src/frontends/qt4/ui/QTocUi.ui: lay out in a grid.
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13685 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 15:50:13 +00:00
Bo Peng
2f3ac2d20f
Initial Qt4 support for view-source feature (r13610), from Bo Peng (ben.bob@gmail.com)
...
* add src/frontend/qt4/QViewSource.h/C, QViewSourceDialog.h/C, ui/QViewSourceUi.ui
* modify corresponding qt4/Makefile.am Makefile.dialogs, Dialogs.C
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13682 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-15 14:13:41 +00:00
Abdelrazak Younes
e2ddbdca5c
use const_cast<QWorkArea*> instead of C-style cast
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13673 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 20:44:38 +00:00
Abdelrazak Younes
544d542c7d
compilation fixes following rev 13671
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13672 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 20:39:42 +00:00
Lars Gullik Bjønnes
67d576f75e
* frontends/WorkArea.h(workAreaResize, scrollDocView, workAreaKeyPress,
...
dispatch, selectionReuqested, selectionLost): remove signals
* BufferView.[Ch] (selectionRequested, selectionLost, workAreaResize,
workAreaKeyPress, workAreaDispatch): add forwarding functions to the pimpl
* BufferView_pimpl.C (Pimpl): Remove the setup of the now deleted signals,
also remove corresponding connection objects.
* frontends/xforms/XWorkArea.h:
* frontends/qt2/QWorkArea.h:
* frontends/qt4/QWorkArea.h:
* frontends/gtk/GWorkArea.h: add LyXView as class variable view_ (qt
classes also get view() medthod)
* frontends/qt2/QWorkArea.C:
* frontends/qt2/QContentPane.C:
* frontends/qt4/QWorkArea.C:
* frontends/xforms/XWorkArea.C:
* frontends/gtk/GWorkArea.C: Change from calling signals to call
the functions directly through view_.view()
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13671 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 18:58:48 +00:00
Lars Gullik Bjønnes
3b44c08e43
* lyxfunc.h:
...
* BufferView_pimpl.h: delete LyXKeySymPtr typedef
* kbmap.h: include LyXKeysym.h and remove forward declaration of LyXKeySym,
and delete LyXKeySymPtr typedef
* kbsequence.h:
* frontends/WorkArea.h: delete LyXKeySymPtr typedef, include LyXKeySym.h
and don't include boost/shared_ptr.hpp, remove forward declaration of
LyXKeySym.
* frontends/LyXKeySym.h: include boost/shared_ptr.hpp, and add typedef
for LyXKeySymPtr
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13663 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-13 12:18:42 +00:00
Jean-Marc Lasgouttes
637a28fe60
Compilation fix: Replace MakeAbsPath with makeAbsPath
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13657 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-12 14:02:23 +00:00
Abdelrazak Younes
5b66bd5d4c
Compilation fix: Replace MakeAbsPath with makeAbsPath
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13656 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-12 13:53:01 +00:00
Abdelrazak Younes
5b448e549e
Fix enableCustom
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13645 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 10:51:59 +00:00
Abdelrazak Younes
9960bf9278
Fix related to r13635
...
closePB renamed to cancelPB
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13644 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 10:13:17 +00:00
Abdelrazak Younes
1ddacf35e0
added "none" color special case.
...
TODO: see how to get rid of these special cases...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13642 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 09:59:56 +00:00
Abdelrazak Younes
107356b439
Transfered closePB handlling (GUI code) from QToc.C to QTocDialog.C
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13641 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 09:56:56 +00:00
Abdelrazak Younes
31d7f2ed30
I have continued a bit on my track to do a real model view separation for the Citation Dialog. In this new scheme, QCitation is the controller and the model at the same time, it inherits ControlCitation and it doesn't know about the view. QCitationDialog is the view, it is using QCitation to get its model and for communication with the core; it is inheriting Dialog::View directly.
...
In frontend/qt4/Dialog.C, we use these class like this:
} else if (name == "citation") {
QCitation * ci = new QCitation(*dialog);
dialog->setController(ci);
dialog->setView(new QCitationDialog(*dialog, ci));
dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
Now, it should be possible to define another view like this:
} else if (name == "citation-inline") {
QCitation * ci = new QCitation(*dialog);
dialog->setController(ci);
dialog->setView(new QCitationInline(*dialog, ci));
All the citation functionalities are not there yet but the basic ones are there. There are still a few "intelligence" still to be transfered from the view to the dialog.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13635 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-11 08:26:43 +00:00
Bo Peng
d7bccc5f88
Update on view-source feature (r13610), from Bo Peng (ben.bob@gmail.com)
...
* src/text3.C, src/lyxfunc.C: no special treatment of view-source dialog now.
* src/frontends/controllers/ControlViewSource.h, .C:
handle everything (get source type, code) in the controller.
* src/insets/insetbibtex.C, insetexternal.C insetinclude.C:
add dryrun mode to file copying etc.
* src/frontends/qt2/QViewSource.C: small changes when calling the controller.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13627 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-10 16:27:59 +00:00
Abdelrazak Younes
c7511f4cab
clean up the function renaming cleanup (libFileSearch instead of LibFileSearch)
...
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13615 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-09 21:24:01 +00:00
Abdelrazak Younes
9dfa853d2c
lib/Makefile.am: move math icons from no-install
...
QMathDialog.C: set icon paths
QMathUi.ui: set icon paths to lib/images/math for visual feedback in designer
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13614 a592a061-630c-0410-9148-cb99ea01b6c8
2006-04-09 21:14:58 +00:00