diff options
| -rw-r--r-- | icons/hi128-app-rekonq.png | bin | 21599 -> 23005 bytes | |||
| -rw-r--r-- | icons/hi16-app-rekonq.png | bin | 954 -> 960 bytes | |||
| -rw-r--r-- | icons/hi32-app-rekonq.png | bin | 2621 -> 2863 bytes | |||
| -rw-r--r-- | icons/hi64-app-rekonq.png | bin | 7571 -> 8476 bytes | |||
| -rw-r--r-- | icons/rekonq.svgz | bin | 32828 -> 34958 bytes | |||
| -rw-r--r-- | src/application.cpp | 15 | ||||
| -rw-r--r-- | src/mainwindow.cpp | 4 |
7 files changed, 14 insertions, 5 deletions
diff --git a/icons/hi128-app-rekonq.png b/icons/hi128-app-rekonq.png Binary files differindex c9eb8f0a..1b0d5b82 100644 --- a/icons/hi128-app-rekonq.png +++ b/icons/hi128-app-rekonq.png diff --git a/icons/hi16-app-rekonq.png b/icons/hi16-app-rekonq.png Binary files differindex f6c54bd0..ab0c1c98 100644 --- a/icons/hi16-app-rekonq.png +++ b/icons/hi16-app-rekonq.png diff --git a/icons/hi32-app-rekonq.png b/icons/hi32-app-rekonq.png Binary files differindex 3beb22f4..b3e9ceea 100644 --- a/icons/hi32-app-rekonq.png +++ b/icons/hi32-app-rekonq.png diff --git a/icons/hi64-app-rekonq.png b/icons/hi64-app-rekonq.png Binary files differindex bdd13d12..502ae87c 100644 --- a/icons/hi64-app-rekonq.png +++ b/icons/hi64-app-rekonq.png diff --git a/icons/rekonq.svgz b/icons/rekonq.svgz Binary files differindex ee927542..95796761 100644 --- a/icons/rekonq.svgz +++ b/icons/rekonq.svgz diff --git a/src/application.cpp b/src/application.cpp index e3c06a5b..fdd02bf5 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -87,6 +87,16 @@ int Application::newInstance() { KCmdLineArgs::setCwd(QDir::currentPath().toUtf8()); KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + + // we share one process for several mainwindows, + // so initialize only once + static bool first = true; + + if (first) + { + QTimer::singleShot(0, this, SLOT(postLaunch())); + first = false; + } // is your app session restored? restore session... // this mechanism also falls back to load usual plain rekonq @@ -151,6 +161,10 @@ void Application::postLaunch() Application::historyManager(); Application::sessionManager(); + + // bookmarks loading + connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), + Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); } @@ -393,7 +407,6 @@ MainWindow *Application::newMainWindow() m_mainWindows.prepend(w); w->show(); - QTimer::singleShot(0, this, SLOT(postLaunch())); return w; } diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index ac9b83bb..45a12a78 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -204,10 +204,6 @@ void MainWindow::postLaunch() // Find Bar signal connect(m_findBar, SIGNAL(searchString(const QString &)), this, SLOT(slotFind(const QString &))); - // bookmarks loading - connect(Application::bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), - Application::instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); - // setting up toolbars to NOT have context menu enabled setContextMenuPolicy(Qt::DefaultContextMenu); |
