summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO3
-rw-r--r--src/application.cpp10
2 files changed, 9 insertions, 4 deletions
diff --git a/TODO b/TODO
index f61d5065..300de9cd 100644
--- a/TODO
+++ b/TODO
@@ -10,10 +10,11 @@ DONE QNetworkDiskCache
DONE loading right sites as "external browser" (rekonq %u)
DONE provide translations structure
DONE disable BACK button when history is NULL
+DONE load just ONE site at start
- QWebFrame
DONE(?) definitely fix fonts!
- fix crash on example sites..
-- load just ONE site at start
+
- improve DOCUMENTATION
diff --git a/src/application.cpp b/src/application.cpp
index 53b1cbce..0151d364 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -65,7 +65,6 @@ Application::Application()
m_mainWindow->setObjectName("MainWindow");
setWindowIcon(KIcon("rekonq"));
newTab();
- mainWindow()->slotHome();
m_mainWindow->show();
@@ -87,7 +86,9 @@ int Application::newInstance()
if (args->count() > 0)
{
- for (int i = 0; i < args->count(); ++i)
+ KUrl url = MainWindow::guessUrlFromString(args->arg(0));
+ mainWindow()->loadUrl(url);
+ for (int i = 1; i < args->count(); ++i)
{
KUrl url = MainWindow::guessUrlFromString(args->arg(i));
newTab();
@@ -95,6 +96,10 @@ int Application::newInstance()
}
args->clear();
}
+ else
+ {
+ mainWindow()->slotHome();
+ }
return 0;
}
@@ -161,7 +166,6 @@ NetworkAccessManager *Application::networkAccessManager()
}
-
HistoryManager *Application::historyManager()
{
if (!s_historyManager)