[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps] konqueror/src: Konqueror location bar: reset url to
From:       Marcel Partap <mpartap () gmx ! net>
Date:       2011-07-19 17:20:00
Message-ID: 20110719172000.1B48AA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 7c1e03ae16570f417db70e0b83c0b2a54b5ca7bd by Marcel Partap.
Committed on 19/07/2011 at 19:02.
Pushed by mpartap into branch 'master'.

Konqueror location bar: reset url to current view's actual url on ESC

Simplest possible approach: put current view's url in address bar
 - even for corner cases like about:konqueror or about:blank
 (discussed @ https://svn.reviewboard.kde.org/r/6681 )

BUG: 257841

M  +5    -0    konqueror/src/konqmainwindow.cpp

http://commits.kde.org/kde-baseapps/7c1e03ae16570f417db70e0b83c0b2a54b5ca7bd

diff --git a/konqueror/src/konqmainwindow.cpp b/konqueror/src/konqmainwindow.cpp
index f86d906..72c8040 100644
--- a/konqueror/src/konqmainwindow.cpp
+++ b/konqueror/src/konqmainwindow.cpp
@@ -3185,6 +3185,11 @@ bool KonqMainWindow::eventFilter(QObject*obj, QEvent *ev)
       if ((keyEv->key() == Qt::Key_Tab) && (keyEv->modifiers() == Qt::ControlModifier)) {
           slotCtrlTabPressed();
           return true; // don't let QTabWidget see the event
+      } else if (obj == m_combo && m_currentView && keyEv->key() == Qt::Key_Escape) {
+          // reset url to current view's actual url on ESC
+          m_combo->setURL(m_currentView->url().pathOrUrl());
+          m_combo->lineEdit()->setModified(false);
+          return true;
       }
   }
   return KParts::MainWindow::eventFilter( obj, ev );

[prev in list] [next in list] [prev in thread] [next in thread]