#include <config.h>
-#include "GuiWorkArea.h"
+#include "GuiCompleter.h"
#include "Buffer.h"
#include "BufferView.h"
#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>
namespace lyx {
namespace frontend {
-class RtlItemDelegate : public QItemDelegate {
+class CompleterItemDelegate : public QItemDelegate
+{
public:
- explicit RtlItemDelegate(QObject * parent = 0)
- : QItemDelegate(parent), enabled_(false) {}
+ explicit CompleterItemDelegate(QObject * parent)
+ : QItemDelegate(parent)
+ {}
- 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_;
-};
-
-
-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);
}
};
-
-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
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()));
GuiCompleter::GuiCompleter(GuiWorkArea * gui, QObject * parent)
- : QCompleter(parent), gui_(gui), updateLock_(0),
+ : QCompleter(parent), gui_(gui), old_cursor_(0), updateLock_(0),
inlineVisible_(false), popupVisible_(false),
modelActive_(false)
{
// Setup the completion popup
- setModel(new GuiCompletionModel(this, 0));
+ model_ = new GuiCompletionModel(this, 0);
+ setModel(model_);
setCompletionMode(QCompleter::PopupCompletion);
+ setCaseSensitivity(Qt::CaseInsensitive);
setWidget(gui_);
// create the popup
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);
}
+bool GuiCompleter::uniqueCompletionAvailable() const
+{
+ if (!modelActive_)
+ return false;
+
+ size_t n = popup()->model()->rowCount();
+ if (n > 1 || n == 0)
+ return false;
+
+ // if there is exactly one, we have to check whether it is a
+ // real completion, i.e. longer than the current prefix.
+ if (completionPrefix() == currentCompletion())
+ return false;
+
+ return true;
+}
+
+
bool GuiCompleter::completionAvailable() const
{
if (!modelActive_)
if (!inlineVisible() && possibleInlineState && start
&& cur.inset().automaticInlineCompletion())
inline_timer_.start(int(lyxrc.completion_inline_delay * 1000));
+ else {
+ // no inline completion, hence a metrics update is needed
+ if (!(cur.disp_.update() & Update::Force))
+ cur.updateFlags(cur.disp_.update() | Update::SinglePar);
+ }
// update prefix if any completion is possible
bool modelActive = modelActive_ && model()->rowCount() > 0;
// 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
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);
}
-void GuiCompleter::hidePopup(Cursor & cur)
+void GuiCompleter::hidePopup(Cursor &)
{
popupVisible_ = false;
{
popup()->hide();
if (!inlineVisible())
- setModel(new GuiCompletionModel(this, 0));
+ model_->setList(0);
}
void GuiCompleter::hideInline(Cursor & cur)
{
- gui_->bufferView().setInlineCompletion(cur, DocIterator(), docstring());
+ gui_->bufferView().setInlineCompletion(cur, DocIterator(cur.buffer()), docstring());
inlineVisible_ = false;
if (inline_timer_.isActive())
void GuiCompleter::asyncHideInline()
{
if (!popupVisible())
- setModel(new GuiCompletionModel(this, 0));
+ model_->setList(0);
}
void GuiCompleter::activate()
{
if (!popupVisible() && !inlineVisible())
- return;
-
- popupActivated(currentCompletion());
+ tab();
+ else
+ popupActivated(currentCompletion());
}
cur.updateFlags(Update::None);
// check that inline completion is active
- if (!inlineVisible()) {
+ if (!inlineVisible() && !uniqueCompletionAvailable()) {
// try to activate the inline completion
if (cur.inset().inlineCompletionSupported(cur)) {
showInline();
return;
}
+ // Make undo possible
+ cur.recordUndo();
+
// 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);
i = n;
else
i = l;
- BOOST_ASSERT(0 <= i && i <= n);
+ LASSERT(i <= n, /**/);
}
// select the first if none was found
if (n == 0)
return docstring();
QString s = model.data(model.index(0, 0), Qt::EditRole).toString();
-
+
if (modelSorting() == QCompleter::UnsortedModel) {
// For unsorted model we cannot do more than iteration.
// Iterate through the completions and cut off where s differs
}
}
- return from_utf8(fromqstr(s));
+ return qstring_to_ucs4(s);
}
Cursor cur = gui_->bufferView().cursor();
cur.updateFlags(Update::None);
+ cur.recordUndo();
+
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);
} // namespace frontend
} // namespace lyx
-#include "GuiCompleter_moc.cpp"
+#include "moc_GuiCompleter.cpp"