Nabble - konqueror

[konqmainwindow.patch]
Index: konqmainwindow.cpp

=========================

--- konqmainwindow.cpp	(revision 1044576)

+++ konqmainwindow.cpp	(working copy)

@@ -469,7 +469,7 @@

     if (m_currentDir.isEmpty() && m_currentView)

        m_currentDir = m_currentView->url().path( KUrl::AddTrailingSlash );

 

-    KUrl filteredURL ( KonqMisc::konqFilteredURL( this, url, m_currentDir ) );

+    const QString filteredURL = KonqMisc::konqFilteredURL( this, url, m_currentDir );

     kDebug(1202) << "url" << url << "filtered into" << filteredURL;

 

     if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user)

@@ -477,8 +477,16 @@

 

     m_currentDir.clear();

 

-    openUrl(0, filteredURL, QString(), req);

+    const QString prevFilteredURL = KonqMisc::konqFilteredURL(this, m_currentView->typedUrl(), m_currentDir);

+    kDebug(1202) << "previous url" << m_currentView->typedUrl() << "filtered into" << prevFilteredURL;

 

+    // If the current url in the view is the same as the one being displayed

+    // simply do a reload instead of calling openUrl...

+    if (urlcmp(filteredURL, prevFilteredURL))

+      slotReload();

+    else

+      openUrl(0, KUrl(filteredURL), QString(), req);

+

     // #4070: Give focus to view after URL was entered manually

     // Note: we do it here if the view mode (i.e. part) wasn't changed

     // If it is changed, then it's done in KonqView::changePart


[konqmainwindow.patch]
Index: konqmainwindow.cpp

=========================

--- konqmainwindow.cpp	(revision 1044576)

+++ konqmainwindow.cpp	(working copy)

@@ -469,7 +469,7 @@

     if (m_currentDir.isEmpty() && m_currentView)

        m_currentDir = m_currentView->url().path( KUrl::AddTrailingSlash );

 

-    KUrl filteredURL ( KonqMisc::konqFilteredURL( this, url, m_currentDir ) );

+    const QString filteredURL = KonqMisc::konqFilteredURL( this, url, m_currentDir );

     kDebug(1202) << "url" << url << "filtered into" << filteredURL;

 

     if ( filteredURL.isEmpty() ) // initially empty, or error (e.g. ~unknown_user)

@@ -477,8 +477,16 @@

 

     m_currentDir.clear();

 

-    openUrl(0, filteredURL, QString(), req);

+    const QString prevFilteredURL = KonqMisc::konqFilteredURL(this, m_currentView->typedUrl(), m_currentDir);

+    kDebug(1202) << "previous url" << m_currentView->typedUrl() << "filtered into" << prevFilteredURL;

 

+    // If the current url in the view is the same as the one being displayed

+    // simply do a reload instead of calling openUrl...

+    if (urlcmp(filteredURL, prevFilteredURL, KUrl::CompareWithoutTrailingSlash))

+      slotReload();

+    else

+      openUrl(0, KUrl(filteredURL), QString(), req);

+

     // #4070: Give focus to view after URL was entered manually

     // Note: we do it here if the view mode (i.e. part) wasn't changed

     // If it is changed, then it's done in KonqView::changePart


[searchbar.patch]
Index: searchbar.cpp

===================================================================

--- searchbar.cpp	(revision 1027752)

+++ searchbar.cpp	(working copy)

@@ -194,7 +194,7 @@

     if (m_urlEnterLock || search.isEmpty() || !m_part)

         return;

     if (m_searchMode == FindInThisPage) {

-        KHTMLPart *part = dynamic_cast<KHTMLPart*>(m_part);

+        KHTMLPart *part = qobject_cast<KHTMLPart*>(m_part);

         if (part) {

             part->findText(search, 0);

             part->findTextNext();

@@ -292,7 +292,8 @@

 

         m_popupMenu = new QMenu(m_searchCombo);

         m_popupMenu->setObjectName("search selection menu");

-        m_popupMenu->addAction(KIcon("edit-find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()));

+        QAction *action = m_popupMenu->addAction(KIcon("edit-find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()));

+        action->setDisabled((qobject_cast<KHTMLPart*>(m_part) == 0));

         m_popupMenu->addSeparator();

 

         int i =- 1;

@@ -458,7 +459,7 @@

 

 void SearchBarPlugin::updateComboVisibility()

 {

-    bool isBrowser = m_part && dynamic_cast<KHTMLPart *>(m_part);

+    const bool isBrowser = (m_part != 0);

 

     m_searchComboAction->setVisible(isBrowser && !m_searchComboAction->associatedWidgets().isEmpty());

 

@@ -502,33 +503,35 @@

 

 void SearchBarPlugin::HTMLDocLoaded()

 {

-    KHTMLPart *khtmlPart = static_cast<KHTMLPart *>(m_part);

+    KHTMLPart *khtmlPart = qobject_cast<KHTMLPart *>(m_part);

 

-    DOM::HTMLDocument htmlDoc = khtmlPart->htmlDocument();

-    DOM::NodeList headNL = htmlDoc.getElementsByTagName("head");

-    if (headNL.length() < 1) {

-        return;

-    }

+    if (khtmlPart) {

+        DOM::HTMLDocument htmlDoc = khtmlPart->htmlDocument();

+        DOM::NodeList headNL = htmlDoc.getElementsByTagName("head");

+        if (headNL.length() < 1) {

+            return;

+        }

 

-    DOM::Node headNode = headNL.item(0);

-    if (headNode.nodeType() != 1) {

-        return;

-    }

+        DOM::Node headNode = headNL.item(0);

+        if (headNode.nodeType() != 1) {

+            return;

+        }

 

-    DOM::HTMLElement headEl = (DOM::HTMLElement) headNode;

-    DOM::NodeList linkNL = headEl.getElementsByTagName("link");

+        DOM::HTMLElement headEl = (DOM::HTMLElement) headNode;

+        DOM::NodeList linkNL = headEl.getElementsByTagName("link");

 

-    for (unsigned int i = 0; i < linkNL.length(); i++) {

-        if (linkNL.item(i).nodeType() == 1) {

-            DOM::HTMLElement linkEl = (DOM::HTMLElement)linkNL.item(i);

-            if (linkEl.getAttribute("rel") == "search" && linkEl.getAttribute("type") == "application/opensearchdescription+xml") {

-                if (headEl.getAttribute("profile") != "http://a9.com/-/spec/opensearch/1.1/") {

-                    kWarning() << "Warning: there is no profile attribute or wrong profile attribute in <head>, as specified by open search specification 1.1";

+        for (unsigned int i = 0; i < linkNL.length(); i++) {

+            if (linkNL.item(i).nodeType() == 1) {

+                DOM::HTMLElement linkEl = (DOM::HTMLElement)linkNL.item(i);

+                if (linkEl.getAttribute("rel") == "search" && linkEl.getAttribute("type") == "application/opensearchdescription+xml") {

+                    if (headEl.getAttribute("profile") != "http://a9.com/-/spec/opensearch/1.1/") {

+                        kWarning() << "Warning: there is no profile attribute or wrong profile attribute in <head>, as specified by open search specification 1.1";

+                    }

+

+                    QString title = linkEl.getAttribute("title").string();

+                    QString href = linkEl.getAttribute("href").string();

+                    m_openSearchDescs.insert(title, href);

                 }

-

-                QString title = linkEl.getAttribute("title").string();

-                QString href = linkEl.getAttribute("href").string();

-                m_openSearchDescs.insert(title, href);

             }

         }

     }


[searchbar.patch]
Index: searchbar.cpp

===================================================================

--- searchbar.cpp	(revision 1027752)

+++ searchbar.cpp	(working copy)

@@ -194,7 +194,7 @@

     if (m_urlEnterLock || search.isEmpty() || !m_part)

         return;

     if (m_searchMode == FindInThisPage) {

-        KHTMLPart *part = dynamic_cast<KHTMLPart*>(m_part);

+        KHTMLPart *part = qobject_cast<KHTMLPart*>(m_part);

         if (part) {

             part->findText(search, 0);

             part->findTextNext();

@@ -292,7 +292,8 @@

 

         m_popupMenu = new QMenu(m_searchCombo);

         m_popupMenu->setObjectName("search selection menu");

-        m_popupMenu->addAction(KIcon("edit-find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()));

+        QAction *action = m_popupMenu->addAction(KIcon("edit-find"), i18n("Find in This Page"), this, SLOT(useFindInThisPage()));

+        action->setDisabled((qobject_cast<KHTMLPart*>(m_part) == 0));

         m_popupMenu->addSeparator();

 

         int i =- 1;

@@ -458,7 +459,7 @@

 

 void SearchBarPlugin::updateComboVisibility()

 {

-    bool isBrowser = m_part && dynamic_cast<KHTMLPart *>(m_part);

+    bool isBrowser = (m_part && m_part->browserExtension());

 

     m_searchComboAction->setVisible(isBrowser && !m_searchComboAction->associatedWidgets().isEmpty());

 

@@ -502,33 +503,35 @@

 

 void SearchBarPlugin::HTMLDocLoaded()

 {

-    KHTMLPart *khtmlPart = static_cast<KHTMLPart *>(m_part);

+    KHTMLPart *khtmlPart = qobject_cast<KHTMLPart *>(m_part);

 

-    DOM::HTMLDocument htmlDoc = khtmlPart->htmlDocument();

-    DOM::NodeList headNL = htmlDoc.getElementsByTagName("head");

-    if (headNL.length() < 1) {

-        return;

-    }

+    if (khtmlPart) {

+        DOM::HTMLDocument htmlDoc = khtmlPart->htmlDocument();

+        DOM::NodeList headNL = htmlDoc.getElementsByTagName("head");

+        if (headNL.length() < 1) {

+            return;

+        }

 

-    DOM::Node headNode = headNL.item(0);

-    if (headNode.nodeType() != 1) {

-        return;

-    }

+        DOM::Node headNode = headNL.item(0);

+        if (headNode.nodeType() != 1) {

+            return;

+        }

 

-    DOM::HTMLElement headEl = (DOM::HTMLElement) headNode;

-    DOM::NodeList linkNL = headEl.getElementsByTagName("link");

+        DOM::HTMLElement headEl = (DOM::HTMLElement) headNode;

+        DOM::NodeList linkNL = headEl.getElementsByTagName("link");

 

-    for (unsigned int i = 0; i < linkNL.length(); i++) {

-        if (linkNL.item(i).nodeType() == 1) {

-            DOM::HTMLElement linkEl = (DOM::HTMLElement)linkNL.item(i);

-            if (linkEl.getAttribute("rel") == "search" && linkEl.getAttribute("type") == "application/opensearchdescription+xml") {

-                if (headEl.getAttribute("profile") != "http://a9.com/-/spec/opensearch/1.1/") {

-                    kWarning() << "Warning: there is no profile attribute or wrong profile attribute in <head>, as specified by open search specification 1.1";

+        for (unsigned int i = 0; i < linkNL.length(); i++) {

+            if (linkNL.item(i).nodeType() == 1) {

+                DOM::HTMLElement linkEl = (DOM::HTMLElement)linkNL.item(i);

+                if (linkEl.getAttribute("rel") == "search" && linkEl.getAttribute("type") == "application/opensearchdescription+xml") {

+                    if (headEl.getAttribute("profile") != "http://a9.com/-/spec/opensearch/1.1/") {

+                        kWarning() << "Warning: there is no profile attribute or wrong profile attribute in <head>, as specified by open search specification 1.1";

+                    }

+

+                    QString title = linkEl.getAttribute("title").string();

+                    QString href = linkEl.getAttribute("href").string();

+                    m_openSearchDescs.insert(title, href);

                 }

-

-                QString title = linkEl.getAttribute("title").string();

-                QString href = linkEl.getAttribute("href").string();

-                m_openSearchDescs.insert(title, href);

             }

         }

     }



Nabble - konqueror

Re: PATCH: Entering the same url in Konqueror's location bar...

PATCH: Entering the same url in Konqueror's location bar...

Bekijk mijn Netlog profiel

Re: Problem with saving the "ServiceName" in Konqueror profile files...

Adblock Plugin improvements, part III

Re: Problem with saving the "ServiceName" in Konqueror profile files...

Problem with saving the "ServiceName" in Konqueror profile files...

Re: Flash plugin resize problem

Re: Flash plugin resize problem

Flash plugin resize problem

Re: how to activate Links / javascript function ?

how to activate Links / javascript function ?

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Re: Introducing Project Silk

Memory Leak when doing Reload()

Re: qte version

qte version

Re: [WebKit-devel] KDE Webkit status update...

Re: Make Konqueror's searchbar plugin work with any KPart based browser engine...

Re: Make Konqueror's searchbar plugin work with any KPart based browser engine...

Re: No statusbar in the default konqueror tab ??

Re: No statusbar in the default konqueror tab ??

Re: No statusbar in the default konqueror tab ??

Re: Make Konqueror's searchbar plugin work with any KPart based browser engine...

Re: Make Konqueror's searchbar plugin work with any KPart based browser engine...

No statusbar in the default konqueror tab ??

Re: Make Konqueror's searchbar plugin work with any KPart based browser engine...

Make Konqueror's searchbar plugin work with any KPart based browser engine...

Re: how to externally trigger konq-e to refresh view

Re: how to externally trigger konq-e to refresh view

Re: Review Request: khtml adblock filter lookup API