Changeset 27564

Timestamp:

11/16/08 18:02:40 (2 months ago)

Author:

sts

Message:

* complete-accept directly completes if the completion is unique

Files:

• lyx-devel/trunk/src/frontends/qt4/GuiCompleter.cpp (modified) (5 diffs)
• lyx-devel/trunk/src/frontends/qt4/GuiCompleter.h (modified) (1 diff)

lyx-devel/trunk/src/frontends/qt4/GuiCompleter.cpp

@@ -235 +235 @@
-
-
+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
-{
@@ -639 +657 @@
-        
-        // check that inline completion is active
-
+ && !uniqueCompletionAvailable()
-                // try to activate the inline completion
-                if (cur.inset().inlineCompletionSupported(cur)) {
@@ -661 +679 @@
-        }
-        
+        // Make undo possible
+        cur.recordUndo();
+
-        // If completion is active, at least complete by one character
-        docstring prefix = cur.inset().completionPrefix(cur);
@@ -803 +824 @@
-                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.
@@ -852 +873 @@
-        cur.updateFlags(Update::None);
-        
+        cur.recordUndo();
+
-        docstring prefix = cur.inset().completionPrefix(cur);
-        docstring postfix = qstring_to_ucs4(completion.mid(prefix.length()));

lyx-devel/trunk/src/frontends/qt4/GuiCompleter.h

@@ -71 +71 @@
-        ///
-        docstring longestUniqueCompletion() const;
+        ///
+        bool uniqueCompletionAvailable() const;
-        
-public Q_SLOTS: