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

List:       kde-commits
Subject:    branches/KDE/4.3/kdebase/apps/konqueror/src
From:       Luboš Luňák <l.lunak () kde ! org>
Date:       2010-01-02 23:03:30
Message-ID: 1262473410.875905.21611.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1069209 by lunakl:

Backport r1069208.
Do not show a new window too soon, as it messes up handling
of the MMB-on-a-link-opens-new-window-in-background feature.



 M  +2 -1      konqmainwindow.cpp  
 M  +7 -4      konqmisc.cpp  
 M  +4 -2      konqmisc.h  


--- branches/KDE/4.3/kdebase/apps/konqueror/src/konqmainwindow.cpp #1069208:1069209
@@ -1196,7 +1196,8 @@
 
     // Pass the URL to createNewWindow so that it can select the right profile for \
it  // Note that it's always empty in case of window.open, though.
-    mainWindow = KonqMisc::createNewWindow(url, args, browserArgs, false, \
QStringList(), false, false /*do not open URL*/); +    mainWindow = \
KonqMisc::createNewWindow(url, args, browserArgs, false, QStringList(), +        \
false, false /*do not open URL*/, false /*don't show*/);  \
mainWindow->resetAutoSaveSettings(); // Don't autosave  
     KonqOpenURLRequest req;
--- branches/KDE/4.3/kdebase/apps/konqueror/src/konqmisc.cpp #1069208:1069209
@@ -81,7 +81,8 @@
 
 KonqMainWindow * KonqMisc::createNewWindow( const KUrl &url, const \
                KParts::OpenUrlArguments &args,
                                             const KParts::BrowserArguments& \
                browserArgs,
-                                            bool forbidUseHTML, const QStringList \
&filesToSelect, bool tempFile, bool openUrl ) +                                       \
bool forbidUseHTML, const QStringList &filesToSelect, +                               \
bool tempFile, bool openUrl, bool show )  {
     //kDebug() << "url=" << url;
     // For HTTP or html files, use the web browsing profile, otherwise use \
filemanager profile @@ -93,13 +94,14 @@
   QString profile = KStandardDirs::locate( "data", \
QLatin1String("konqueror/profiles/") + profileName );  return \
createBrowserWindowFromProfile(profile, profileName,  url, args, browserArgs,
-					forbidUseHTML, filesToSelect, tempFile, openUrl );
+					forbidUseHTML, filesToSelect, tempFile, openUrl, show );
 }
 
 KonqMainWindow * KonqMisc::createBrowserWindowFromProfile( const QString& _path, \
                const QString &filename, const KUrl &url,
                                                            const \
                KParts::OpenUrlArguments &args,
                                                            const \
                KParts::BrowserArguments& browserArgs,
-                                                           bool forbidUseHTML, const \
QStringList& filesToSelect, bool tempFile, bool openUrl ) +                           \
bool forbidUseHTML, const QStringList& filesToSelect, +                               \
bool tempFile, bool openUrl, bool show )  {
     QString path(_path);
     kDebug(1202) << "path=" << path << ", filename=" << filename << ", url=" << url;
@@ -153,7 +155,8 @@
   if ( forbidUseHTML )
       mainWindow->setShowHTML( false );
   mainWindow->setInitialFrameName( browserArgs.frameName );
-  mainWindow->show();
+  if ( show )
+      mainWindow->show();
   return mainWindow;
 }
 
--- branches/KDE/4.3/kdebase/apps/konqueror/src/konqmisc.h #1069208:1069209
@@ -57,7 +57,8 @@
                                       bool forbidUseHTML = false,
                                       const QStringList &filesToSelect = \
QStringList(),  bool tempFile = false,
-                                      bool openUrl = true);
+                                      bool openUrl = true,
+                                      bool show = true);
 
     /**
      * Create a new window from the profile defined by @p filename and @p path.
@@ -73,7 +74,8 @@
                                                      bool forbidUseHTML = false,
                                                      const QStringList& \
                filesToSelect = QStringList(),
                                                      bool tempFile = false,
-                                                     bool openUrl = true);
+                                                     bool openUrl = true,
+                                                     bool show = true);
 
     /**
      * Creates a new window from the history of a view, copies the history


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