Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-12 Thread Jean-Marc Lasgouttes
> "John" == John Levon <[EMAIL PROTECTED]> writes: John> On Fri, Jul 09, 2004 at 07:43:37PM +0200, Georg Baum wrote: >> ^^^ this is the reason, because almost everything in >> qtranslator.h is inside #ifndef QT_NO_TRANSLATION ... #endif Ahhh, thanks for noticing it! It was just there in f

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-10 Thread John Levon
On Fri, Jul 09, 2004 at 07:43:37PM +0200, Georg Baum wrote: > ^^^ this is the reason, because almost everything in qtranslator.h is > inside #ifndef QT_NO_TRANSLATION ... #endif Unfortunately I cannot remember why we turn it off :( > If something with moc is going wrong, it shows up at link

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-10 Thread Andre Poenitz
On Fri, Jul 09, 2004 at 04:14:25PM +0200, Jean-Marc Lasgouttes wrote: > Angus> lyx_gui.C is currently defined in Makefile.am: Makefile.am: > Angus> lyx_gui.C > > Angus> You need to move it to the MOCFILES target of Makefile.dialogs. > > I added it to MOCFILES and now I get (after much automake ru

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Nirmal Govind
How does it work? It is easy: for 1/, we make sure that dummy menu entries are added at the beginning of each menu containing the About/Preferences/Quit entries. They are then 'stolen' by Qt/Mac and go to the LyX menu/ I suspect that the current code does not work in all cases, but we'll see this l

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Georg Baum
Am Freitag, 9. Juli 2004 15:19 schrieb Jean-Marc Lasgouttes: > The big problem with this patch is that it does not build, and I do > not know why. After changing the two new #ifdef in lyx_gui.C to > #ifndef, compilation yields: > > g++ -DHAVE_CONFIG_H -I. -I../../../../lyx-devel/src/frontends/qt2

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Jean-Marc Lasgouttes
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> moc is a preprocessor. It is used to generate a .C file, Angus> substituting all those nasty Q_FOO macros for c++ code. The c++ Angus> compiler gets to compile this generated .C file. Indeed. However, we have a rule like %_moc.C: $

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Angus Leeming
Jean-Marc Lasgouttes wrote: >> "Angus" == Angus Leeming <[EMAIL PROTECTED]> >> writes: > > Angus> This does indeed need to be passed through moc. Q_EXPORT and > Angus> Q_OBJECT are moc macros. > > Angus> lyx_gui.C is currently defined in Makefile.am: Makefile.am: > Angus> lyx_gui.C > >

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Jean-Marc Lasgouttes
> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes: Angus> This does indeed need to be passed through moc. Q_EXPORT and Angus> Q_OBJECT are moc macros. Angus> lyx_gui.C is currently defined in Makefile.am: Makefile.am: Angus> lyx_gui.C Angus> You need to move it to the MOCFILES target of

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Angus Leeming
Jean-Marc Lasgouttes wrote: > How come that QTranslator is an incomplete type although I did > include ? Do I need to use moc or another cryptic > tool? How do I do that? H. Looking at the header file in question: class Q_EXPORT QTranslator: public QObject { Q_OBJECT public: This doe

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-09 Thread Jean-Marc Lasgouttes
> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes: Bennett> On Jul 8, 2004, at 9:55 AM, Jean-Marc Lasgouttes wrote: Bennett> However, "LyX > Preferences" is still greyed out, and once Bennett> again I can't find a way to access it from the menu. >> And is "LyX >About LyX" present (and do

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-08 Thread Jean-Marc Lasgouttes
> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes: Bennett> On Jul 8, 2004, at 9:55 AM, Jean-Marc Lasgouttes wrote: Bennett> However, "LyX > Preferences" is still greyed out, and once Bennett> again I can't find a way to access it from the menu. >> And is "LyX >About LyX" present (and do

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-08 Thread Bennett Helm
On Jul 8, 2004, at 9:55 AM, Jean-Marc Lasgouttes wrote: Bennett> However, "LyX > Preferences" is still greyed out, and once Bennett> again I can't find a way to access it from the menu. And is "LyX >About LyX" present (and does it work)? I am wondering whether Qt/Mac really sees our entries. There

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-08 Thread Jean-Marc Lasgouttes
> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes: Bennett> (I take it you intended me to reverse the first patch before Bennett> applying this, right?) Yes. Bennett> "Edit > Text Styles" is back, as is "Tools > Spelling" and Bennett> "Tools > TeX Information". Bennett> Also, there's

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-08 Thread Bennett Helm
On Jul 8, 2004, at 6:30 AM, Jean-Marc Lasgouttes wrote: Bennett> 1. In the LyX menu, what formally had been "Preferences" (but Bennett> really was the Document Settings dialog) is now permanently Bennett> greyed-out, so I can't access it. Does it make a difference when you try to open a menu before

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-08 Thread Jean-Marc Lasgouttes
> "Bennett" == Bennett Helm <[EMAIL PROTECTED]> writes: >> The following patch is a first attempt at fixing menu merging >> problems in LyX/Mac. It requires to at least Qt/Mac 3.2.2 (the >> undocumented function we use appeared at this time). >> >> I would appreciate heavy testing of this (I

Re: [experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-07 Thread Bennett Helm
The following patch is a first attempt at fixing menu merging problems in LyX/Mac. It requires to at least Qt/Mac 3.2.2 (the undocumented function we use appeared at this time). I would appreciate heavy testing of this (I think that it compiles, but cannot go further). Well, it almost compiles! (Yo

[experimental PATCH] Fix menu merging madness in Qt/Mac

2004-07-07 Thread Jean-Marc Lasgouttes
The following patch is a first attempt at fixing menu merging problems in LyX/Mac. It requires to at least Qt/Mac 3.2.2 (the undocumented function we use appeared at this time). I would appreciate heavy testing of this (I think that it compiles, but cannot go further). Bennett, Nirmal, that means