- Sort lyxlex table

- Get rid of setRenderHint for anti-aliasing, because we should respect user windows setting

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15699 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index 38c77e0f72142515233b81fb1d73bdb29c5f4b72..fddccfb6c8e4d4fc9a6fd880cbf2a4f2339d286e 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -238,10 +238,10 @@ Menu & Menu::read(LyXLex & lex)
        };
 
        struct keyword_item menutags[md_last - 1] = {
+               { "bookmarks", md_bookmarks },
                { "branches", md_branches },
                { "charstyles", md_charstyles },
                { "documents", md_documents },
-               { "bookmarks", md_bookmarks },
                { "end", md_endmenu },
                { "exportformats", md_exportformats },
                { "floatinsert", md_floatinsert },
@@ -255,8 +255,8 @@ Menu & Menu::read(LyXLex & lex)
                { "separator", md_separator },
                { "submenu", md_submenu },
                { "toc", md_toc },
-               { "updateformats", md_updateformats },
                { "toolbars", md_toolbars },
+               { "updateformats", md_updateformats },
                { "viewformats", md_viewformats }
        };
 

diff --git a/src/frontends/qt4/QLPainter.C b/src/frontends/qt4/QLPainter.C
index beba02550cdf6507c869e9bf7bc37a2a9cd0ab45..34f856731dfa7ae782f76dba745ea78bc321629d 100644 (file)
--- a/src/frontends/qt4/QLPainter.C
+++ b/src/frontends/qt4/QLPainter.C
@@ -35,7 +35,6 @@ namespace frontend {
 QLPainter::QLPainter(QPaintDevice * device)
        : QPainter(device), Painter()
 {
-       setRenderHint(QPainter::TextAntialiasing);
        // new QPainter has default QPen:
        current_color_ = LColor::black;
        current_ls_ = line_solid;
@@ -238,8 +237,10 @@ int QLPainter::text(int x, int y, char_type const * s, size_t ls,
                        setFont(fi.font);
                // We need to draw the text as LTR as we use our own bidi code.
                setLayoutDirection(Qt::LeftToRight);
-               if (isDrawingEnabled())
+               if (isDrawingEnabled()) {
+                       lyxerr << "draw " << std::string(str.toUtf8()) << " at " << x << "," << y << std::endl;
                        drawText(x, y, str);
+               }
                // Here we use the font width cache instead of
                //   textwidth = fontMetrics().width(str);
                // because the above is awfully expensive on MacOSX