* open popup on complete-accept if there is a completion available

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

diff --git a/src/frontends/qt4/GuiCompleter.cpp b/src/frontends/qt4/GuiCompleter.cpp
index 89696be97f94b2042886e5bcda2e58c03a9b8ae0..a110bb21e046122426108e964daac3a34f2ab6f0 100644 (file)
--- a/src/frontends/qt4/GuiCompleter.cpp
+++ b/src/frontends/qt4/GuiCompleter.cpp
@@ -10,7 +10,7 @@
 
 #include <config.h>
 
-#include "GuiWorkArea.h"
+#include "GuiCompleter.h"
 
 #include "Buffer.h"
 #include "BufferView.h"
@@ -18,12 +18,14 @@
 #include "Cursor.h"
 #include "Dimension.h"
 #include "FuncRequest.h"
+#include "GuiWorkArea.h"
 #include "GuiView.h"
 #include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
 #include "version.h"
 
+#include "support/lassert.h"
 #include "support/debug.h"
 
 #include <QApplication>
@@ -41,46 +43,24 @@ using namespace lyx::support;
 namespace lyx {
 namespace frontend {
 
-class RtlItemDelegate : public QItemDelegate {
+class CompleterItemDelegate : public QItemDelegate
+{
 public:
-       explicit RtlItemDelegate(QObject * parent = 0)
-               : QItemDelegate(parent), enabled_(false) {}
-
-       void setEnabled(bool enabled = true)
-       {
-               enabled_ = enabled;
-       }
-       
-protected:
-       virtual void drawDisplay(QPainter * painter,
-               QStyleOptionViewItem const & option,
-               QRect const & rect, QString const & text) const
-       {
-               if (!enabled_) {
-                       QItemDelegate::drawDisplay(painter, option, rect, text);
-                       return;
-               }
-
-               // FIXME: do this more elegantly
-               docstring stltext = qstring_to_ucs4(text);
-               reverse(stltext.begin(), stltext.end());
-               QItemDelegate::drawDisplay(painter, option, rect, toqstr(stltext));
-       }
-       
-private:
-       bool enabled_;
-};
+       explicit CompleterItemDelegate(QObject * parent)
+               : QItemDelegate(parent)
+       {}
 
-
-class PixmapItemDelegate : public QItemDelegate {
-public:
-       explicit PixmapItemDelegate(QObject *parent = 0)
-               : QItemDelegate(parent) {}
+       ~CompleterItemDelegate()
+       {}
 
 protected:
        void paint(QPainter *painter, const QStyleOptionViewItem &option,
                   const QModelIndex &index) const
        {
+               if (index.column() == 0) {
+                       QItemDelegate::paint(painter, option, index);
+                       return;
+               }
                QStyleOptionViewItem opt = setOptions(index, option);
                QVariant value = index.data(Qt::DisplayRole);
                QPixmap pixmap = qvariant_cast<QPixmap>(value);
@@ -99,22 +79,27 @@ protected:
        }
 };
 
-
-class GuiCompletionModel : public QAbstractListModel {
+class GuiCompletionModel : public QAbstractListModel
+{
 public:
        ///
        GuiCompletionModel(QObject * parent, CompletionList const * l)
-               : QAbstractListModel(parent), list_(l) {}
+               : QAbstractListModel(parent), list_(l)
+       {}
        ///
-       ~GuiCompletionModel()
-               { delete list_; }
+       ~GuiCompletionModel() { delete list_; }
+       ///
+       void setList(CompletionList const * l) {
+               delete list_;
+               list_ = l;
+               reset();
+       }
        ///
        bool sorted() const
        {
                if (list_)
                        return list_->sorted();
-               else
-                       return false;
+               return false;
        }
        ///
        int columnCount(const QModelIndex & /*parent*/ = QModelIndex()) const
@@ -144,7 +129,8 @@ public:
                    
                if (index.column() == 0)
                        return toqstr(list_->data(index.row()));
-               else if (index.column() == 1) {
+
+               if (index.column() == 1) {
                        // get icon from cache
                        QPixmap scaled;
                        QString const name = ":" + toqstr(list_->icon(index.row()));
@@ -176,7 +162,8 @@ GuiCompleter::GuiCompleter(GuiWorkArea * gui, QObject * parent)
          modelActive_(false)
 {
        // Setup the completion popup
-       setModel(new GuiCompletionModel(this, 0));
+       model_ = new GuiCompletionModel(this, 0);
+       setModel(model_);
        setCompletionMode(QCompleter::PopupCompletion);
        setWidget(gui_);
        
@@ -191,9 +178,8 @@ GuiCompleter::GuiCompleter(GuiWorkArea * gui, QObject * parent)
        listView->setUniformRowHeights(true);
        setPopup(listView);
        
-       rtlItemDelegate_ = new RtlItemDelegate(this);
-       popup()->setItemDelegateForColumn(0, rtlItemDelegate_);
-       popup()->setItemDelegateForColumn(1, new PixmapItemDelegate(this));
+       itemDelegate_ = new CompleterItemDelegate(this);
+       popup()->setItemDelegate(itemDelegate_);
        
        // create timeout timers
        popup_timer_.setSingleShot(true);
@@ -379,7 +365,7 @@ void GuiCompleter::updateInline(Cursor & cur, QString const & completion)
        
        // compute postfix
        docstring prefix = cur.inset().completionPrefix(cur);
-       docstring postfix = from_utf8(fromqstr(completion.mid(prefix.length())));
+       docstring postfix = qstring_to_ucs4(completion.mid(prefix.length()));
        
        // shorten it if necessary
        if (lyxrc.completion_inline_dots != -1
@@ -469,19 +455,15 @@ void GuiCompleter::updateModel(Cursor & cur, bool popupUpdate, bool inlineUpdate
        bool rtl = false;
        if (cur.inTexted()) {
                Paragraph const & par = cur.paragraph();
-               Font const font =
-               par.getFontSettings(cur.bv().buffer().params(), cur.pos());
+               Font const & font =
+                       par.getFontSettings(cur.bv().buffer().params(), cur.pos());
                rtl = font.isVisibleRightToLeft();
        }
        popup()->setLayoutDirection(rtl ? Qt::RightToLeft : Qt::LeftToRight);
 
-       // turn the direction of the strings in the popup.
-       // Qt does not do that itself.
-       rtlItemDelegate_->setEnabled(rtl);
-
        // set new model
        CompletionList const * list = cur.inset().createCompletionList(cur);
-       setModel(new GuiCompletionModel(this, list));
+       model_->setList(list);
        modelActive_ = true;
        if (list->sorted())
                setModelSorting(QCompleter::CaseSensitivelySortedModel);
@@ -549,7 +531,7 @@ void GuiCompleter::asyncHidePopup()
 {
        popup()->hide();
        if (!inlineVisible())
-               setModel(new GuiCompletionModel(this, 0));
+               model_->setList(0);
 }
 
 
@@ -584,7 +566,7 @@ void GuiCompleter::hideInline(Cursor & cur)
 void GuiCompleter::asyncHideInline()
 {
        if (!popupVisible())
-               setModel(new GuiCompletionModel(this, 0));
+               model_->setList(0);
 }
 
 
@@ -643,9 +625,9 @@ void GuiCompleter::hideInline()
 void GuiCompleter::activate()
 {
        if (!popupVisible() && !inlineVisible())
-               return;
-
-       popupActivated(currentCompletion());
+               tab();
+       else
+               popupActivated(currentCompletion());
 }
 
 
@@ -680,7 +662,7 @@ void GuiCompleter::tab()
        
        // If completion is active, at least complete by one character
        docstring prefix = cur.inset().completionPrefix(cur);
-       docstring completion = from_utf8(fromqstr(currentCompletion()));
+       docstring completion = qstring_to_ucs4(currentCompletion());
        if (completion.size() <= prefix.size()) {
                // finalize completion
                cur.inset().insertCompletion(cur, docstring(), true);
@@ -786,7 +768,7 @@ void GuiCompleter::setCurrentCompletion(QString const & s)
                        i = n;
                else
                        i = l;
-               BOOST_ASSERT(i <= n);
+               LASSERT(i <= n, /**/);
        }
 
        // select the first if none was found
@@ -860,7 +842,7 @@ docstring GuiCompleter::longestUniqueCompletion() const
                }
        }
 
-       return from_utf8(fromqstr(s));
+       return qstring_to_ucs4(s);
 }
 
 
@@ -870,7 +852,7 @@ void GuiCompleter::popupActivated(const QString & completion)
        cur.updateFlags(Update::None);
        
        docstring prefix = cur.inset().completionPrefix(cur);
-       docstring postfix = from_utf8(fromqstr(completion.mid(prefix.length())));
+       docstring postfix = qstring_to_ucs4(completion.mid(prefix.length()));
        cur.inset().insertCompletion(cur, postfix, true);
        hidePopup(cur);
        hideInline(cur);
@@ -898,4 +880,4 @@ void GuiCompleter::popupHighlighted(const QString & completion)
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiCompleter_moc.cpp"
+#include "moc_GuiCompleter.cpp"