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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror/src
From:       David Faure <faure () kde ! org>
Date:       2010-12-09 17:44:11
Message-ID: 20101209174411.33673AC8A5 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1204922 by dfaure:

Use same html part as the current view in all cases of creating a new tab, including \
                createNewWindow.
CCMAIL: adawit@kde.org


 M  +1 -6      konqmainwindow.cpp  
 M  +12 -1     konqviewmanager.cpp  


--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #1204921:1204922
@@ -544,18 +544,13 @@
         view = m_currentView; /* Note, this can be 0, e.g. on startup */
     else if (!view && req.browserArgs.newTab()) {
 
-        QString serviceName;
-         // Use same html part as the current view (e.g. webkit).
-        if (m_currentView && m_currentView->supportsMimeType("text/html"))
-            serviceName = m_currentView->service()->desktopEntryName();
-
         // The URL should be opened in a new tab. Let's create the tab right away,
         // it gives faster user feedback (#163628). For a short while \
                (kde-4.1-beta1)
         // I removed this entire block so that we wouldn't end up with a useless tab \
                when
         // launching an external application for this mimetype. But user feedback
         // in all cases is more important than empty tabs in some cases.
         view = m_pViewManager->addTab("text/html",
-                                      serviceName,
+                                      QString(),
                                       false,
                                       req.openAfterCurrentPage);
         if (view) {
--- trunk/KDE/kdebase/apps/konqueror/src/konqviewmanager.cpp #1204921:1204922
@@ -222,8 +222,19 @@
 
   Q_ASSERT( !serviceType.isEmpty() );
 
-  KonqViewFactory newViewFactory = createView( serviceType, serviceName, service, \
partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ ); +  QString \
actualServiceName = serviceName; +  if (serviceType == "text/html" && \
actualServiceName.isEmpty()) { +      // Use same html part as the current view (e.g. \
webkit). +      // This is down here in this central method because it should work \
for +      // MMB-opens-tab, window.open (createNewWindow), and more.
+      KonqView* currentView = m_pMainWindow->currentView();
+      if (currentView && currentView->supportsMimeType("text/html")) {
+          actualServiceName = currentView->service()->desktopEntryName();
+      }
+  }
 
+  KonqViewFactory newViewFactory = createView( serviceType, actualServiceName, \
service, partServiceOffers, appServiceOffers, true /*forceAutoEmbed*/ ); +
   if( newViewFactory.isNull() )
     return 0L; //do not split at all if we can't create the new view
 


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