* src/frontends/qt4/Dialogs.cpp:

[features.git] / src / frontends / qt4 / Dialogs.cpp

diff --git a/src/frontends/qt4/Dialogs.cpp b/src/frontends/qt4/Dialogs.cpp
index 0735eab547f325870c3fa18c69a0d7d835ef4a02..619e0ed6ac89dece72254f626be2e1e4dc81c2ad 100644 (file)
--- a/src/frontends/qt4/Dialogs.cpp
+++ b/src/frontends/qt4/Dialogs.cpp
@@ -25,6 +25,7 @@
 #include "ControlFloat.h"
 #include "ControlGraphics.h"
 #include "ControlInclude.h"
+#include "ControlListings.h"
 #include "ControlLog.h"
 #include "ControlViewSource.h"
 #include "ControlMath.h"
@@ -66,6 +67,7 @@
 #include "QIndex.h"
 #include "QMathMatrixDialog.h"
 #include "QNomencl.h"
+#include "QListings.h"
 #include "QLog.h"
 #include "QViewSource.h"
 #include "QNote.h"
@@ -112,7 +114,7 @@ char const * const dialognames[] = {
 "thesaurus",
 #endif
 
-"texinfo", "toc", "url", "view-source", "vspace", "wrap" };
+"texinfo", "toc", "url", "view-source", "vspace", "wrap", "listings" };
 
 char const * const * const end_dialognames =
        dialognames + (sizeof(dialognames) / sizeof(char *));
@@ -225,7 +227,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "nomenclature") {
                dialog->setController(new ControlCommand(*dialog, name, name));
-               dialog->setView(new QNomencl(*dialog, _("Glossary Entry")));
+               dialog->setView(new QNomencl(*dialog, _("Nomenclature Entry")));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        } else if (name == "label") {
                dialog->setController(new ControlCommand(*dialog, name, name));
@@ -241,8 +243,14 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                QViewSource * qvs = new QViewSource(*dialog);
                dialog->setController(qvs);
                GuiView & gui_view = static_cast<GuiView &>(lyxview_);
+#ifdef Q_WS_MACX
+               // Mac uses a drawer that should be on the right.
+               dialog->setView(new DockView<QViewSource, QViewSourceDialog>(
+                       *dialog, qvs, &gui_view, _("LaTeX Source")));
+#else
                dialog->setView(new DockView<QViewSource, QViewSourceDialog>(
                        *dialog, qvs, &gui_view, _("LaTeX Source"), Qt::BottomDockWidgetArea));
+#endif
                dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "mathdelimiter") {
                dialog->setController(new ControlMath(*dialog));
@@ -304,7 +312,7 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                QToc * qtoc = new QToc(*dialog, &gui_view);
                dialog->setController(qtoc);
                dialog->setView(new DockView<QToc, TocWidget>(
-                       *dialog, qtoc, &gui_view, _("Toc")));
+                       *dialog, qtoc, &gui_view, _("Outline")));
                dialog->bc().bp(new OkCancelPolicy);
        } else if (name == "url") {
                dialog->setController(new ControlCommand(*dialog, name, name));
@@ -318,6 +326,10 @@ Dialogs::DialogPtr Dialogs::build(string const & name)
                dialog->setController(new ControlWrap(*dialog));
                dialog->setView(new QWrap(*dialog));
                dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
+       } else if (name == "listings") {
+               dialog->setController(new ControlListings(*dialog));
+               dialog->setView(new QListings(*dialog));
+               dialog->bc().bp(new NoRepeatedApplyReadOnlyPolicy);
        }
 
        return dialog;