From 35cdc4f30f167037ef25f8f0a2d134cff74a599a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Oct 2012 21:52:46 +0200
Subject: clean up urlbar url loading. We really are lighter now :)

---
 src/urlbar/completionwidget.cpp | 106 ++++++++++++++++++++++++----------------
 1 file changed, 63 insertions(+), 43 deletions(-)

(limited to 'src/urlbar/completionwidget.cpp')

diff --git a/src/urlbar/completionwidget.cpp b/src/urlbar/completionwidget.cpp
index 12051f80..cf00a77c 100644
--- a/src/urlbar/completionwidget.cpp
+++ b/src/urlbar/completionwidget.cpp
@@ -261,63 +261,68 @@ bool CompletionWidget::eventFilter(QObject *obj, QEvent *ev)
 
             case Qt::Key_Enter:
             case Qt::Key_Return:
+            {
                 w = qobject_cast<UrlBar *>(parent());
-                if (kev->modifiers() == Qt::AltModifier)
-                {
-                    if (kev->key() == Qt::Key_Return || kev->key() == Qt::Key_Enter)
-                    {
-                        emit chosenUrl(w->text(), Rekonq::NewFocusedTab);
-                    }
-                }
-
-                if (!w->text().startsWith(QL1S("http://"), Qt::CaseInsensitive))
-                {
-                    QString append;
-                    if (kev->modifiers() == Qt::ControlModifier)
-                    {
-                        append = QL1S(".com");
-                    }
-                    else if (kev->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
-                    {
-                        append = QL1S(".org");
-                    }
-                    else if (kev->modifiers() == Qt::ShiftModifier)
-                    {
-                        append = QL1S(".net");
-                    }
-
-                    if (!append.isEmpty())
-                    {
-                        QUrl url(QL1S("http://") + w->text());
-                        QString host = url.host();
-                        if (!host.endsWith(append, Qt::CaseInsensitive))
-                        {
-                            host += append;
-                            url.setHost(host);
-                        }
-
-                        emit chosenUrl(url, Rekonq::CurrentTab);
-                    }
-                }
 
+//                 if (!w->text().startsWith(QL1S("http://"), Qt::CaseInsensitive))
+//                 {
+//                     QString append;
+//                     if (kev->modifiers() == Qt::ControlModifier)
+//                     {
+//                         append = QL1S(".com");
+//                     }
+//                     else if (kev->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
+//                     {
+//                         append = QL1S(".org");
+//                     }
+//                     else if (kev->modifiers() == Qt::ShiftModifier)
+//                     {
+//                         append = QL1S(".net");
+//                     }
+// 
+//                     if (!append.isEmpty())
+//                     {
+//                         QUrl url(QL1S("http://") + w->text());
+//                         QString host = url.host();
+//                         if (!host.endsWith(append, Qt::CaseInsensitive))
+//                         {
+//                             host += append;
+//                             url.setHost(host);
+//                         }
+// 
+//                         emit chosenUrl(url, Rekonq::CurrentTab);
+//                     }
+//                 }
+
+                KUrl urlToLoad;
+                Rekonq::OpenType type = Rekonq::CurrentTab;
+                
                 if (_currentIndex == -1)
                     _currentIndex = 0;
                 child = findChild<ListItem *>(QString::number(_currentIndex));
 
                 if (child) //the completionwidget is visible and the user had press down
                 {
-                    //we can use the url of the listitem
-                    emit chosenUrl(child->url(), Rekonq::CurrentTab);
+                    urlToLoad = child->url();
                 }
                 else //the user type too fast (completionwidget not visible or suggestion not downloaded)
                 {
-                    KUrl u = UrlResolver::urlFromTextTyped(w->text());
-                    emit chosenUrl(u, Rekonq::CurrentTab);
+                    urlToLoad = UrlResolver::urlFromTextTyped(w->text());
                 }
-                kev->accept();
+
+                if (kev->modifiers() == Qt::AltModifier)
+                {
+                    if (kev->key() == Qt::Key_Return || kev->key() == Qt::Key_Enter)
+                    {
+                        type = Rekonq::NewFocusedTab;
+                    }
+                }
+
                 hide();
+                emit chosenUrl(urlToLoad, type);
+                kev->accept();
                 return true;
-
+            }
             case Qt::Key_Escape:
                 hide();
                 return true;
@@ -387,3 +392,18 @@ void CompletionWidget::suggestUrls(const QString &text)
     // NOTE: It's important to call this AFTER orderedSearchItems() to let everything work
     res->computeSuggestions();
 }
+
+
+KUrl CompletionWidget::activeSuggestion()
+{
+    int index = _currentIndex;
+    if (_currentIndex == -1)
+        index = 0;
+
+    ListItem *child = findChild<ListItem *>(QString::number(index));
+    if (child)
+        return child->url();
+
+    kDebug() << "WARNING: NO URL to LOAD...";
+    return KUrl();
+}
-- 
cgit v1.2.1