On Dec 1, 2006, at 10:38 AM, Jean-Marc Lasgouttes wrote:
"Abdelrazak" == Abdelrazak Younes <[EMAIL PROTECTED]> writes:
Abdelrazak> Jean-Marc Lasgouttes wrote:
I am beginning to wonder whether we should disable all menu
merging, as Qt/Mac allows us to do.
Abdelrazak> I think this is a sound solution, at least for 1.5.0.
Let's try to be more ambitious. This patch tries to reimplement the
feature. It is cleaner than the previous one because (1) the use of
Action helps and (2) I think I got a better idea. The idea remains
basically the same, though.
The merging can be disabled by commenting out
#define MERGE_MAC_MENUS
in QLPopups.h. The patches to GuiApplication.* and qt_helpers.h are
unrelated cleanups and could be applied separately.
Also, I suspect that this fixes the behaviour of the menu when a
dialog is open.
Bennett, could you test the patch? I do not expect that it will work
at the first try... You could also test what happens when undefining
MERGE_MAC_MENUS, to see whether it would be an acceptable fallback.
Also a question: am I right that the bindings in menus are gone
currently?
Yes: they're gone.
The patch won't compile:
Making all in qt4
make all-recursive
Making all in ui
make all-am
make[7]: Nothing to be done for `all-am'.
if /bin/sh ../../../libtool --tag=CXX --mode=compile g++ -
DHAVE_CONFIG_H -I. -I. -I../../../src -DQT_CLEAN_NAMESPACE -
DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS -Winvalid-pch --
include=./pch.h -I../../../src -I../../../src/frontends -I../../../
images -I/Users/bennett/lyx/Qt-4.2.1-install/include -I/Users/bennett/
lyx/Qt-4.2.1-install/include/QtCore -I/Users/bennett/lyx/Qt-4.2.1-
install/include/QtGui -I../../../boost -I../../../src/frontends/
controllers -Wextra -Wall -g -Os -MT QLMenubar.lo -MD -MP -MF
".deps/QLMenubar.Tpo" -c -o QLMenubar.lo QLMenubar.C; \
then mv -f ".deps/QLMenubar.Tpo" ".deps/QLMenubar.Plo"; else rm -f
".deps/QLMenubar.Tpo"; exit 1; fi
g++ -DHAVE_CONFIG_H -I. -I. -I../../../src -DQT_CLEAN_NAMESPACE -
DQT_GENUINE_STR -DQT_NO_STL -DQT_NO_KEYWORDS -Winvalid-pch --
include=./pch.h -I../../../src -I../../../src/frontends -I../../../
images -I/Users/bennett/lyx/Qt-4.2.1-install/include -I/Users/bennett/
lyx/Qt-4.2.1-install/include/QtCore -I/Users/bennett/lyx/Qt-4.2.1-
install/include/QtGui -I../../../boost -I../../../src/frontends/
controllers -Wextra -Wall -g -Os -MT QLMenubar.lo -MD -MP -MF .deps/
QLMenubar.Tpo -c QLMenubar.C -o QLMenubar.o
QLMenubar.C: In member function 'void
lyx::frontend::QLMenubar::macxMenuBarInit()':
QLMenubar.C:172: error: 'qt_mac_set_menubar_merge' was not declared
in this scope
make[6]: *** [QLMenubar.lo] Error 1
make[5]: *** [all-recursive] Error 1
make[4]: *** [all] Error 2
make[3]: *** [all-recursive] Error 1
make[2]: *** [all] Error 2
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2
Bennett
