From 130b9564624b976b2b1e615e7457d43f985ef0ce Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Tue, 29 Sep 2009 01:59:14 +0200 Subject: New rekonq home page layout --- data/home.html | 106 +++++++++++++++++++++++++------------------------------ src/homepage.cpp | 63 +++++++++++++++++---------------- src/homepage.h | 2 +- 3 files changed, 81 insertions(+), 90 deletions(-) diff --git a/data/home.html b/data/home.html index b5ca9b67..1daa34fb 100644 --- a/data/home.html +++ b/data/home.html @@ -6,6 +6,9 @@ - - - - - - -
-
%2
-
%3
+
+ + +%3
-
%4
diff --git a/src/homepage.cpp b/src/homepage.cpp index 4c72712f..912ed11d 100644 --- a/src/homepage.cpp +++ b/src/homepage.cpp @@ -73,17 +73,13 @@ QString HomePage::rekonqHomePage() QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics"); QString speed = speedDial(); - QString search = searchEngines(); - QString lastBlock = ReKonfig::showLastVisitedSites() ? fillRecentHistory() : recentlyClosedTabs() ; + QString menu = homePageMenu(); - QString html = QString(QLatin1String(file.readAll())) .arg(imagesPath) - .arg(search) - .arg(lastBlock) + .arg(menu) .arg(speed) ; - return html; } @@ -93,32 +89,31 @@ QString HomePage::speedDial() QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); - QString speed; - for(int i = 0; i< urls.count(); ++i) + QString speed = ""; + for(int i=0; i<4; ++i) { - speed += "
"; + speed += "
"; speed += ""; speed += ""; speed += ""; speed += ""; - speed += "
"; - speed += "" + names.at(i) + "
"; + speed += "

"; + speed += "" + names.at(i) + "
"; } - return speed; -} - - -QString HomePage::searchEngines() -{ - QString engines = "

" + i18n("Search Engines") + "

"; - - // Google search engine - engines += "
"; - engines += ""; - engines += ""; - engines += "
"; + speed += ""; + for(int i=4; i<8; ++i) + { + speed += "
"; + speed += ""; + speed += ""; + speed += ""; + speed += ""; + speed += "

"; + speed += "" + names.at(i) + "
"; + } + speed += ""; - return engines; + return speed; } @@ -126,14 +121,12 @@ QString HomePage::recentlyClosedTabs() { QString closed = "

" + i18n("Recently closed tabs") + "

"; closed += ""; return closed; } @@ -143,9 +136,7 @@ QString HomePage::fillRecentHistory() { QString history = "

" + i18n("Last 20 visited sites") + "

"; history += "