From c896cc340d7e6e0878b3249c5792e6d88a12cf42 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Fri, 30 Apr 2010 11:23:37 +0200 Subject: A coding style round --- src/newtabpage.cpp | 272 ++++++++++++++++++++++++++--------------------------- 1 file changed, 136 insertions(+), 136 deletions(-) (limited to 'src/newtabpage.cpp') diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index 7f13647b..f0cee9e1 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -11,9 +11,9 @@ * published by the Free Software Foundation; either version 2 of * the License or (at your option) version 3 or any later version * accepted by the membership of KDE e.V. (or its successor approved -* by the membership of KDE e.V.), which shall act as a proxy +* by the membership of KDE e.V.), which shall act as a proxy * defined in Section 14 of version 3 of the license. -* +* * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -59,12 +59,12 @@ NewTabPage::NewTabPage(QWebFrame *frame) - : QObject(frame) - , m_root(frame->documentElement()) + : QObject(frame) + , m_root(frame->documentElement()) { QString htmlFilePath = KStandardDirs::locate("data", "rekonq/htmls/home.html"); - QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics"); - + QString imagesPath = QString("file://") + KGlobal::dirs()->findResourceDir("data", "rekonq/pics/bg.png") + QString("rekonq/pics"); + QFile file(htmlFilePath); bool isOpened = file.open(QIODevice::ReadOnly); if (!isOpened) @@ -86,83 +86,83 @@ NewTabPage::~NewTabPage() void NewTabPage::generate(const KUrl &url) { - if(KUrl("about:preview").isParentOf(url)) + if (KUrl("about:preview").isParentOf(url)) { - if(url.fileName() == QString("add")) + if (url.fileName() == QString("add")) { QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); - + names.append(""); urls.append(""); - + ReKonfig::setPreviewNames(names); ReKonfig::setPreviewUrls(urls); - + // Why doesn't it work well ? // m_root.appendInside(emptyPreview(names.length() - 1)); // Replacing with this : generate(KUrl("about:favorites")); return; } - if(url.directory() == QString("preview/remove")) + if (url.directory() == QString("preview/remove")) { removePreview(url.fileName().toInt()); return; } - if(url.directory() == QString("preview/modify")) + if (url.directory() == QString("preview/modify")) { int index = url.fileName().toInt(); Application::instance()->mainWindow()->currentTab()->createPreviewSelectorBar(index); return; } } - if(url.fileName() == QString("clear")) + if (url.fileName() == QString("clear")) { Application::instance()->mainWindow()->actionByName("clear_private_data")->trigger(); generate(QString("about:" + url.directory())); return; } - if(url == KUrl("about:bookmarks/edit")) - { + if (url == KUrl("about:bookmarks/edit")) + { Application::bookmarkProvider()->bookmarkManager()->slotEditBookmarks(); return; } - + QWebPage *page = m_root.webFrame()->page(); page->mainFrame()->setHtml(m_html); m_root = page->mainFrame()->documentElement().findFirst("#content"); - + browsingMenu(url); - + QString title; - if(url == KUrl("about:favorites")) + if (url == KUrl("about:favorites")) { favoritesPage(); title = i18n("Favorites"); } - else if(url == KUrl("about:closedTabs")) + else if (url == KUrl("about:closedTabs")) { closedTabsPage(); title = i18n("Closed Tabs"); } - else if(url == KUrl("about:history")) + else if (url == KUrl("about:history")) { historyPage(); title = i18n("History"); } - else if(url == KUrl("about:bookmarks")) + else if (url == KUrl("about:bookmarks")) { bookmarksPage(); title = i18n("Bookmarks"); } - else if(url == KUrl("about:downloads")) + else if (url == KUrl("about:downloads")) { downloadsPage(); title = i18n("Downloads"); } - + m_root.document().findFirst("title").setPlainText(title); } @@ -170,38 +170,38 @@ void NewTabPage::generate(const KUrl &url) void NewTabPage::favoritesPage() { m_root.addClass("favorites"); - + QWebElement add = markup(".link"); add.findFirst("a").setAttribute("href", "about:preview/add"); - add.findFirst("img").setAttribute("src" , QString("file:///" + - KIconLoader::global()->iconPath("list-add", KIconLoader::Small || KIconLoader::SizeSmall))); + add.findFirst("img").setAttribute("src" , QString("file:///" + + KIconLoader::global()->iconPath("list-add", KIconLoader::Small || KIconLoader::SizeSmall))); add.findFirst("span").appendInside(i18n("Add Preview")); m_root.document().findFirst("#actions").appendInside(add); - + QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); - - if(urls.isEmpty()) + + if (urls.isEmpty()) { m_root.addClass("empty"); - m_root.setPlainText( i18n("You can add a preview by clicking the \"Add Preview\" button in the top-right corner of this page") ); + m_root.setPlainText(i18n("You can add a preview by clicking the \"Add Preview\" button in the top-right corner of this page")); return; } - - for(int i=0; i < urls.count() ; ++i) + + for (int i = 0; i < urls.count() ; ++i) { - KUrl url = KUrl( urls.at(i) ); + KUrl url = KUrl(urls.at(i)); QWebElement prev; - - if(url.isEmpty()) + + if (url.isEmpty()) prev = emptyPreview(i); - else if( !WebSnap::existsImage(url) ) + else if (!WebSnap::existsImage(url)) prev = loadingPreview(i, url); else prev = validPreview(i, url, names.at(i)); - + setupPreview(prev, i); - + m_root.appendInside(prev); } } @@ -210,15 +210,15 @@ void NewTabPage::favoritesPage() QWebElement NewTabPage::emptyPreview(int index) { QWebElement prev = markup(".thumbnail"); - + prev.findFirst(".preview img").setAttribute("src" , QString("file:///") + - KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop)); + KIconLoader::global()->iconPath("insert-image", KIconLoader::Desktop)); prev.findFirst("span a").setPlainText(i18n("Set a Preview...")); prev.findFirst("a").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString())); - + setupPreview(prev, index); //hideControls(prev); - + return prev; } @@ -226,12 +226,12 @@ QWebElement NewTabPage::emptyPreview(int index) QWebElement NewTabPage::loadingPreview(int index, const KUrl &url) { QWebElement prev = markup(".thumbnail"); - - prev.findFirst(".preview img").setAttribute("src" , - QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); + + prev.findFirst(".preview img").setAttribute("src" , + QString("file:///") + KStandardDirs::locate("appdata", "pics/busywidget.gif")); prev.findFirst("span a").setPlainText(i18n("Loading Preview...")); prev.findFirst("a").setAttribute("href", url.toMimeDataString()); - + setupPreview(prev, index); showControls(prev); @@ -250,15 +250,15 @@ QWebElement NewTabPage::validPreview(int index, const KUrl &url, const QString & QWebElement prev = markup(".thumbnail"); QString previewPath = QL1S("file://") + WebSnap::imagePathFromUrl(url); QString iString = QVariant(index).toString(); - - prev.findFirst(".preview img").setAttribute("src" , previewPath ); - prev.findFirst("a").setAttribute("href", url.toMimeDataString() ); // NOTE ? - prev.findFirst("span a").setAttribute("href", url.toMimeDataString() ); // NOTE ? - prev.findFirst("span a").setPlainText( checkTitle(title) ); - + + prev.findFirst(".preview img").setAttribute("src" , previewPath); + prev.findFirst("a").setAttribute("href", url.toMimeDataString()); // NOTE ? + prev.findFirst("span a").setAttribute("href", url.toMimeDataString()); // NOTE ? + prev.findFirst("span a").setPlainText(checkTitle(title)); + setupPreview(prev, index); showControls(prev); - + return prev; } @@ -280,15 +280,15 @@ void NewTabPage::showControls(QWebElement e) void NewTabPage::setupPreview(QWebElement e, int index) { e.findFirst(".remove img").setAttribute("src", QString("file:///") + - KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); + KIconLoader::global()->iconPath("edit-delete", KIconLoader::DefaultState)); e.findFirst(".remove").setAttribute("title", "Remove favorite"); e.findFirst(".modify img").setAttribute("src", QString("file:///") + - KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); + KIconLoader::global()->iconPath("insert-image", KIconLoader::DefaultState)); e.findFirst(".modify").setAttribute("title", "Set new favorite"); - + e.findFirst(".modify").setAttribute("href", QString("about:preview/modify/" + QVariant(index).toString())); e.findFirst(".remove").setAttribute("href", QString("about:preview/remove/" + QVariant(index).toString())); - + e.setAttribute("id", "preview" + QVariant(index).toString()); } @@ -296,31 +296,31 @@ void NewTabPage::setupPreview(QWebElement e, int index) void NewTabPage::snapFinished() { // Update page, but only if open - if(m_root.document().findAll("#rekonq-newtabpage").count() == 0) + if (m_root.document().findAll("#rekonq-newtabpage").count() == 0) return; - if(m_root.findAll(".favorites").count() == 0 && m_root.findAll(".closedTabs").count() == 0) + if (m_root.findAll(".favorites").count() == 0 && m_root.findAll(".closedTabs").count() == 0) return; - + QStringList urls = ReKonfig::previewUrls(); QStringList names = ReKonfig::previewNames(); - - for(int i = 0; i < urls.count(); i++) + + for (int i = 0; i < urls.count(); i++) { - KUrl url = KUrl( urls.at(i) ); + KUrl url = KUrl(urls.at(i)); QString title = names.at(i); - - if( WebSnap::existsImage(url) ) + + if (WebSnap::existsImage(url)) { QWebElement prev = m_root.findFirst("#preview" + QVariant(i).toString()); - if( KUrl(prev.findFirst("a").attribute("href")) == url ) + if (KUrl(prev.findFirst("a").attribute("href")) == url) { QWebElement newPrev = validPreview(i, url, title); - - if(m_root.findAll(".closedTabs").count() != 0) + + if (m_root.findAll(".closedTabs").count() != 0) hideControls(newPrev); - + prev.replace(newPrev); - } + } } } } @@ -330,13 +330,13 @@ void NewTabPage::removePreview(int index) { QStringList names = ReKonfig::previewNames(); QStringList urls = ReKonfig::previewUrls(); - + urls.removeAt(index); names.removeAt(index); - + ReKonfig::setPreviewNames(names); ReKonfig::setPreviewUrls(urls); - + generate(KUrl("about:favorites")); ReKonfig::self()->writeConfig(); @@ -346,51 +346,51 @@ void NewTabPage::removePreview(int index) void NewTabPage::browsingMenu(const KUrl ¤tUrl) { QList navItems; - + KIconLoader *loader = KIconLoader::global(); - + QWebElement nav = markup(".link"); // Favorites nav.findFirst("a").setAttribute("href", "about:favorites"); - nav.findFirst("img").setAttribute("src" , QString("file:///" + - loader->iconPath("emblem-favorite", KIconLoader::Desktop ||KIconLoader::SizeSmall))); + nav.findFirst("img").setAttribute("src" , QString("file:///" + + loader->iconPath("emblem-favorite", KIconLoader::Desktop || KIconLoader::SizeSmall))); nav.findFirst("span").appendInside(i18n("Favorites")); navItems.append(nav); - + nav = markup(".link"); // Closed Tabs nav.findFirst("a").setAttribute("href", "about:closedTabs"); - nav.findFirst("img").setAttribute("src" , QString("file:///" + - loader->iconPath("tab-close", KIconLoader::Desktop ||KIconLoader::SizeSmall))); + nav.findFirst("img").setAttribute("src" , QString("file:///" + + loader->iconPath("tab-close", KIconLoader::Desktop || KIconLoader::SizeSmall))); nav.findFirst("span").appendInside(i18n("Closed Tabs")); navItems.append(nav); - + nav = markup(".link"); // Bookmarks nav.findFirst("a").setAttribute("href", "about:bookmarks"); - nav.findFirst("img").setAttribute("src" , QString("file:///" + - loader->iconPath("bookmarks", KIconLoader::Desktop ||KIconLoader::SizeSmall))); + nav.findFirst("img").setAttribute("src" , QString("file:///" + + loader->iconPath("bookmarks", KIconLoader::Desktop || KIconLoader::SizeSmall))); nav.findFirst("span").appendInside(i18n("Bookmarks")); navItems.append(nav); - + nav = markup(".link"); // History nav.findFirst("a").setAttribute("href", "about:history"); - nav.findFirst("img").setAttribute("src" , QString("file:///" + - loader->iconPath("view-history", KIconLoader::Desktop ||KIconLoader::SizeSmall))); + nav.findFirst("img").setAttribute("src" , QString("file:///" + + loader->iconPath("view-history", KIconLoader::Desktop || KIconLoader::SizeSmall))); nav.findFirst("span").appendInside(i18n("History")); navItems.append(nav); - + nav = markup(".link"); // Downloads nav.findFirst("a").setAttribute("href", "about:downloads"); - nav.findFirst("img").setAttribute("src" , QString("file:///" + - loader->iconPath("download", KIconLoader::Desktop ||KIconLoader::SizeSmall))); + nav.findFirst("img").setAttribute("src" , QString("file:///" + + loader->iconPath("download", KIconLoader::Desktop || KIconLoader::SizeSmall))); nav.findFirst("span").appendInside(i18n("Downloads")); navItems.append(nav); - + QWebElement it; foreach(it, navItems) { - if(it.findFirst("a").attribute("href") == currentUrl.toMimeDataString()) + if (it.findFirst("a").attribute("href") == currentUrl.toMimeDataString()) + it.addClass("current"); + else if (currentUrl == "about:home" && it.findFirst("a").attribute("href") == "about:favorites") it.addClass("current"); - else if(currentUrl == "about:home" && it.findFirst("a").attribute("href") == "about:favorites") - it.addClass("current"); m_root.document().findFirst("#navigation").appendInside(it); } } @@ -399,35 +399,35 @@ void NewTabPage::browsingMenu(const KUrl ¤tUrl) void NewTabPage::historyPage() { m_root.addClass("history"); - + QWebElement clearData = markup(".link"); clearData.findFirst("a").setAttribute("href", "about:history/clear"); QString iconPath = QString("file:///" + KIconLoader::global()->iconPath("edit-clear", KIconLoader::SizeSmall || KIconLoader::Small)); - clearData.findFirst("img").setAttribute("src" , iconPath ); + clearData.findFirst("img").setAttribute("src" , iconPath); clearData.findFirst("span").appendInside(i18n("Clear Private Data")); m_root.document().findFirst("#actions").appendInside(clearData); - + HistoryTreeModel *model = Application::historyManager()->historyTreeModel(); - - if(model->rowCount() == 0) + + if (model->rowCount() == 0) { m_root.addClass("empty"); m_root.setPlainText(i18n("Your browsing history is empty")); return; } - + int i = 0; do { - QModelIndex index = model->index(i, 0, QModelIndex() ); - if(model->hasChildren(index)) + QModelIndex index = model->index(i, 0, QModelIndex()); + if (model->hasChildren(index)) { m_root.appendInside(markup("h3")); m_root.lastChild().setPlainText(index.data().toString()); - - for(int j=0; j< model->rowCount(index); ++j) + + for (int j = 0; j < model->rowCount(index); ++j) { - QModelIndex son = model->index(j, 0, index ); + QModelIndex son = model->index(j, 0, index); m_root.appendInside(son.data(HistoryModel::DateTimeRole).toDateTime().toString("hh:mm")); m_root.appendInside(" "); m_root.appendInside(markup("a")); @@ -438,21 +438,21 @@ void NewTabPage::historyPage() } i++; } - while( model->hasIndex( i , 0 , QModelIndex() ) ); + while (model->hasIndex(i , 0 , QModelIndex())); } void NewTabPage::bookmarksPage() { m_root.addClass("bookmarks"); - + QWebElement editBookmarks = markup(".link"); editBookmarks.findFirst("a").setAttribute("href", "about:bookmarks/edit"); QString iconPath = QString("file:///" + KIconLoader::global()->iconPath("bookmarks-organize", KIconLoader::SizeSmall || KIconLoader::Small)); editBookmarks.findFirst("img").setAttribute("src" , iconPath); editBookmarks.findFirst("span").appendInside(i18n("Edit Bookmarks")); m_root.document().findFirst("#actions").appendInside(editBookmarks); - + KBookmarkGroup bookGroup = Application::bookmarkProvider()->rootGroup(); if (bookGroup.isNull()) { @@ -485,7 +485,7 @@ void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent) bm = group.next(bm); } } - else if(bookmark.isSeparator()) + else if (bookmark.isSeparator()) { parent.appendInside("
"); } @@ -502,28 +502,28 @@ void NewTabPage::createBookItem(const KBookmark &bookmark, QWebElement parent) void NewTabPage::closedTabsPage() { m_root.addClass("closedTabs"); - + QList links = Application::instance()->mainWindow()->mainView()->recentlyClosedTabs(); - - if(links.isEmpty()) + + if (links.isEmpty()) { m_root.addClass("empty"); m_root.setPlainText(i18n("There are no recently closed tabs")); return; } - - for(int i=0; i < links.count(); ++i) + + for (int i = 0; i < links.count(); ++i) { HistoryItem item = links.at(i); QWebElement prev; - - if(item.url.isEmpty()) + + if (item.url.isEmpty()) continue; - - prev = WebSnap::existsImage( KUrl(item.url) ) - ? validPreview(i, item.url, item.title) - : loadingPreview(i, item.url); - + + prev = WebSnap::existsImage(KUrl(item.url)) + ? validPreview(i, item.url, item.title) + : loadingPreview(i, item.url); + prev.setAttribute("id", "preview" + QVariant(i).toString()); hideControls(prev); m_root.appendInside(prev); @@ -534,7 +534,7 @@ void NewTabPage::closedTabsPage() QString NewTabPage::checkTitle(const QString &title) { QString t(title); - if(t.length() > 23) + if (t.length() > 23) { t.truncate(20); t += "..."; @@ -546,53 +546,53 @@ QString NewTabPage::checkTitle(const QString &title) void NewTabPage::downloadsPage() { m_root.addClass("downloads"); - + QWebElement clearData = markup(".link"); clearData.findFirst("a").setAttribute("href", "about:downloads/clear"); QString iconPath = QString("file:///" + KIconLoader::global()->iconPath("edit-clear", KIconLoader::SizeSmall || KIconLoader::Small)); - clearData.findFirst("img").setAttribute("src" , iconPath ); + clearData.findFirst("img").setAttribute("src" , iconPath); clearData.findFirst("span").appendInside(i18n("Clear Private Data")); m_root.document().findFirst("#actions").appendInside(clearData); DownloadList list = Application::historyManager()->downloads(); - - if(list.isEmpty()) + + if (list.isEmpty()) { m_root.addClass("empty"); m_root.setPlainText(i18n("There are no recently downloaded files to show")); return; } - + foreach(const DownloadItem &item, list) { m_root.prependInside(markup("div")); - + QWebElement div = m_root.firstChild(); div.addClass("download"); - + KUrl u = KUrl(item.destUrlString); QString fName = u.fileName(); QString dir = QL1S("file://") + u.directory(); - + KIconLoader *loader = KIconLoader::global(); QString iconPath = "file://" + loader->iconPath(KMimeType::iconNameForUrl(u), KIconLoader::Desktop); - + div.appendInside(markup("img")); - div.lastChild().setAttribute("src", iconPath ); - + div.lastChild().setAttribute("src", iconPath); + div.appendInside("" + fName + ""); div.appendInside(" - "); QString date = KGlobal::locale()->formatDateTime(item.dateTime, KLocale::FancyLongDate); div.appendInside("" + date + ""); div.appendInside("
"); - + div.appendInside(item.srcUrlString); div.appendInside("
"); div.appendInside(markup("a")); div.lastChild().setAttribute("href" , dir); div.lastChild().setPlainText("Browse dir"); - + /* TODO : make this link work div.appendInside(" - "); div.appendInside(markup("a")); -- cgit v1.2.1