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

List:       kde-commits
Subject:    KDE/kdebase/apps/konqueror
From:       Dawit Alemayehu <adawit () kde ! org>
Date:       2011-01-03 15:56:27
Message-ID: 20110103155627.7E50DAC8AE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1211302 by adawit:

Added a dbus interface to KonqMainWindowAdaptor to pass mimetype when creating new \
tab. See http://svn.reviewboard.kde.org/r/6243/ for details.

CCMAIL:dfaure@kde.org


 M  +1 -1      client/kfmclient.cpp  
 M  +8 -0      src/KonqMainWindowAdaptor.cpp  
 M  +2 -0      src/KonqMainWindowAdaptor.h  
 M  +16 -0     src/konqmainwindow.cpp  
 M  +5 -0      src/konqmainwindow.h  
 M  +6 -0      src/org.kde.Konqueror.MainWindow.xml  


--- trunk/KDE/kdebase/apps/konqueror/client/kfmclient.cpp #1211301:1211302
@@ -384,7 +384,7 @@
 
         if ( !foundApp.isEmpty() ) {
             org::kde::Konqueror::MainWindow konqWindow( foundApp, foundObj.path(), \
                dbus );
-            QDBusReply<void> newTabReply = konqWindow.newTabASN( url.url(), \
startup_id_str, tempFile ); +            QDBusReply<void> newTabReply = \
konqWindow.newTabASNWithMimeType( url.url(), mimetype, startup_id_str, tempFile );  \
if ( newTabReply.isValid() ) {  sendASNChange();
                 return true;
--- trunk/KDE/kdebase/apps/konqueror/src/KonqMainWindowAdaptor.cpp #1211301:1211302
@@ -54,6 +54,14 @@
   m_pMainWindow->openFilteredUrl( url, true, tempFile );
 }
 
+void KonqMainWindowAdaptor::newTabASNWithMimeType(const QString& url, const QString& \
mimetype, const QByteArray& startup_id, bool tempFile) +{
+#ifdef Q_WS_X11
+  KStartupInfo::setNewStartupId( m_pMainWindow, startup_id );
+#endif
+    m_pMainWindow->openFilteredUrl( url, mimetype, true, tempFile );
+}
+
 void KonqMainWindowAdaptor::reload()
 {
   m_pMainWindow->slotReload();
--- trunk/KDE/kdebase/apps/konqueror/src/KonqMainWindowAdaptor.h #1211301:1211302
@@ -59,6 +59,8 @@
 
     void newTabASN( const QString& url, const QByteArray& startup_id, bool tempFile \
);  
+    void newTabASNWithMimeType(const QString& url, const QString& mimetype, const \
QByteArray& startup_id, bool tempFile); +
     void splitViewHorizontally();
     void splitViewVertically();
 
--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.cpp #1211301:1211302
@@ -497,6 +497,17 @@
     openFilteredUrl( _url, req );
 }
 
+void KonqMainWindow::openFilteredUrl(const QString & _url,  const QString& \
_mimeType, bool inNewTab, bool tempFile) +{
+    KonqOpenURLRequest req( _url );
+    req.browserArgs.setNewTab(inNewTab);
+    req.newTabInFront = true;
+    req.tempFile = tempFile;
+    req.args.setMimeType(_mimeType);
+
+    openFilteredUrl( _url, req );    
+}
+
 void KonqMainWindow::openUrl(KonqView *_view, const KUrl &_url,
                              const QString &_mimeType, const KonqOpenURLRequest& \
_req,  bool trustedSource)
@@ -511,6 +522,11 @@
     QString mimeType(_mimeType);
     KonqOpenURLRequest req(_req);
 
+    if (mimeType.isEmpty())
+        mimeType = req.args.mimeType();
+
+    kDebug() << "mimetype=" << mimeType;
+
     if (!url.isValid()) {
         // I think we can't really get here anymore; I tried and didn't succeed.
         // URL filtering catches this case before hand, and in cases without \
                filtering
--- trunk/KDE/kdebase/apps/konqueror/src/konqmainwindow.h #1211301:1211302
@@ -118,6 +118,11 @@
      */
     void openFilteredUrl(const QString& url, bool inNewTab = false, bool tempFile = \
false);  
+    /**
+     * Convenience overload for openFilteredUrl(url, req)
+     */    
+    void openFilteredUrl(const QString & _url, const QString& _mimeType, bool \
inNewTab, bool tempFile); +
 public Q_SLOTS:
   /**
    * The main openUrl method.
--- trunk/KDE/kdebase/apps/konqueror/src/org.kde.Konqueror.MainWindow.xml \
#1211301:1211302 @@ -15,6 +15,12 @@
       <arg name="startup_id" type="ay" direction="in"/>
       <arg name="tempFile" type="b" direction="in"/>
     </method>
+    <method name="newTabASNWithMimeType">
+      <arg name="url" type="s" direction="in"/>
+      <arg name="mimetype" type="s" direction="in"/>
+      <arg name="startup_id" type="ay" direction="in"/>
+      <arg name="tempFile" type="b" direction="in"/>
+    </method>    
     <method name="reload">
     </method>
     <method name="currentView">


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