Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiToolbar.cpp

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index 581e6ec9d23d40d90fefdd4256a5e4ab4f911496..9f99c0b737fb25913d1158f2c32cc978bf438dfa 100644 (file)
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
@@ -64,7 +64,7 @@
 #include <QToolButton>
 #include <QVariant>
 
-#include <boost/assert.hpp>
+#include "support/assert.h"
 
 #include <map>
 #include <vector>
@@ -108,6 +108,8 @@ private:
 };
 
 
+// this must be sorted alphabetically
+// Upper case comes before lower case
 PngMap sorted_png_map[] = {
        { "Bumpeq", "bumpeq2" },
        { "Cap", "cap2" },
@@ -134,6 +136,7 @@ PngMap sorted_png_map[] = {
        { "Updownarrow", "updownarrow2" },
        { "Upsilon", "upsilon2" },
        { "Vdash", "vdash3" },
+       { "Vert", "vert2" },
        { "Xi", "xi2" },
        { "nLeftarrow", "nleftarrow2" },
        { "nLeftrightarrow", "nleftrightarrow2" },
@@ -152,7 +155,7 @@ QString findPng(QString const & name)
 {
        PngMap const * const begin = sorted_png_map;
        PngMap const * const end = begin + nr_sorted_png_map;
-       BOOST_ASSERT(sorted(begin, end));
+       LASSERT(sorted(begin, end), /**/);
 
        PngMap const * const it = find_if(begin, end, CompareKey(name));
 
@@ -301,7 +304,7 @@ public:
        
        ///
        void drawDisplay(QPainter * painter, QStyleOptionViewItem const & opt,
-               const QRect & rect, const QString & text ) const
+                        const QRect & /*rect*/, const QString & text ) const
        {
                QString utext = underlineFilter(text);
 
@@ -431,7 +434,7 @@ private:
                p->filter();
                for (int i = 0; i < f.length(); ++i) {
                        int p = s.indexOf(f[i], lastp + 1, Qt::CaseInsensitive);
-                       BOOST_ASSERT(p != -1);
+                       LASSERT(p != -1, /**/);
                        if (lastp == p - 1 && lastp != -1) {
                                // remove ")" and append "x)"
                                r = r.left(r.length() - 4) + s[p] + "</u>";
@@ -464,8 +467,9 @@ public:
 };
 
 
-GuiLayoutBox::GuiLayoutBox(GuiView & owner)
-       : owner_(owner), lastSel_(-1), layoutItemDelegate_(new LayoutItemDelegate(this)),
+GuiLayoutBox::GuiLayoutBox(GuiToolbar * bar, GuiView & owner)
+       : owner_(owner), bar_(bar), lastSel_(-1),
+         layoutItemDelegate_(new LayoutItemDelegate(this)),
          visibleCategories_(0), inShowPopup_(false)
 {
        setSizeAdjustPolicy(QComboBox::AdjustToContents);
@@ -486,7 +490,10 @@ GuiLayoutBox::GuiLayoutBox(GuiView & owner)
        view()->setItemDelegateForColumn(0, layoutItemDelegate_);
        
        QObject::connect(this, SIGNAL(activated(int)),
-                        this, SLOT(selected(int)));
+               this, SLOT(selected(int)));
+       QObject::connect(bar_, SIGNAL(iconSizeChanged(QSize)),
+               this, SLOT(setIconSize(QSize)));
+
        owner_.setLayoutDialog(this);
        updateContents(true);
 }
@@ -494,12 +501,6 @@ GuiLayoutBox::GuiLayoutBox(GuiView & owner)
 
 void GuiLayoutBox::setFilter(QString const & s)
 {
-       if (!s.isEmpty())
-               owner_.message(_("Filtering layouts with \"" + fromqstr(s) + "\". "
-                       "Press ESC to remove filter."));
-       else
-               owner_.message(_("Enter characters to filter the layout list."));
-       
        bool enabled = view()->updatesEnabled();
        view()->setUpdatesEnabled(false);
 
@@ -528,13 +529,19 @@ void GuiLayoutBox::setFilter(QString const & s)
                // We do not call our implementation of showPopup because that
                // would reset the filter again. This is only needed if the user clicks
                // on the QComboBox.
-               BOOST_ASSERT(!inShowPopup_);
+               LASSERT(!inShowPopup_, /**/);
                inShowPopup_ = true;
                QComboBox::showPopup();
                inShowPopup_ = false;
 
                // The item delegate hack is off again. So trigger a relayout of the popup.
                filterModel_->triggerLayoutChange();
+               
+               if (!s.isEmpty())
+                       owner_.message(_("Filtering layouts with \"" + fromqstr(s) + "\". "
+                                        "Press ESC to remove filter."));
+               else
+                       owner_.message(_("Enter characters to filter the layout list."));
        }
        
        view()->setUpdatesEnabled(enabled);
@@ -592,7 +599,7 @@ void GuiLayoutBox::showPopup()
 
        // call QComboBox::showPopup. But set the inShowPopup_ flag to switch on
        // the hack in the item delegate to make space for the headers.
-       BOOST_ASSERT(!inShowPopup_);
+       LASSERT(!inShowPopup_, /**/);
        inShowPopup_ = true;
        QComboBox::showPopup();
        inShowPopup_ = false;
@@ -652,6 +659,16 @@ bool GuiLayoutBox::eventFilter(QObject * o, QEvent * e)
        return QComboBox::eventFilter(o, e);
 }
 
+       
+void GuiLayoutBox::setIconSize(QSize size)
+{
+#ifdef Q_WS_MACX
+       bool small = size.height() < 20;
+       setAttribute(Qt::WA_MacSmallSize, small);
+       setAttribute(Qt::WA_MacNormalSize, !small);
+#endif
+}
+
 
 void GuiLayoutBox::set(docstring const & layout)
 {
@@ -747,7 +764,7 @@ void GuiLayoutBox::updateContents(bool reset)
        // or we've moved from one inset to another
        DocumentClass const * text_class = &buffer->params().documentClass();
        Inset const * inset = 
-       owner_.view()->cursor().innerParagraph().inInset();
+               owner_.view()->cursor().innerParagraph().inInset();
        if (!reset && text_class_ == text_class && inset_ == inset) {
                set(owner_.view()->cursor().innerParagraph().layout().name());
                return;
@@ -759,16 +776,16 @@ void GuiLayoutBox::updateContents(bool reset)
        model_->clear();
        DocumentClass::const_iterator lit = text_class_->begin();
        DocumentClass::const_iterator len = text_class_->end();
+
        for (; lit != len; ++lit) {
                docstring const & name = lit->name();
+               bool const useEmpty = inset_->forceEmptyLayout() || inset_->useEmptyLayout();
                // if this inset requires the empty layout, we skip the default
                // layout
-               if (name == text_class_->defaultLayoutName() && inset &&
-                   (inset->forceEmptyLayout() || inset->useEmptyLayout()))
+               if (name == text_class_->defaultLayoutName() && inset_ && useEmpty)
                        continue;
                // if it doesn't require the empty layout, we skip it
-               if (name == text_class_->emptyLayoutName() && inset &&
-                   !inset->forceEmptyLayout() && !inset->useEmptyLayout())
+               if (name == text_class_->emptyLayoutName() && inset_ && !useEmpty)
                        continue;
                addItemSort(name, lit->category(), lyxrc.sort_layouts, lyxrc.group_layouts);
        }
@@ -839,9 +856,8 @@ GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
 
 Action * GuiToolbar::addItem(ToolbarItem const & item)
 {
-       Action * act = new Action(owner_,
-               getIcon(item.func_, false),
-         toqstr(item.label_), item.func_, toqstr(item.label_));
+       Action * act = new Action(&owner_, getIcon(item.func_, false),
+               toqstr(item.label_), item.func_, toqstr(item.label_), this);
        actions_.append(act);
        return act;
 }
@@ -963,7 +979,7 @@ void GuiToolbar::add(ToolbarItem const & item)
                addSeparator();
                break;
        case ToolbarItem::LAYOUTS:
-               layout_ = new GuiLayoutBox(owner_);
+               layout_ = new GuiLayoutBox(this, owner_);
                addWidget(layout_);
                break;
        case ToolbarItem::MINIBUFFER: