FCL/sf/app/browserui: comparison browsercore/appfw/Api/Managers/webpagecontroller.cpp

equal deleted inserted replaced

-:491a1d15372f
+:73c48011b8c7
 *
 */
 #include <assert.h>
-#include "BookmarksManager.h"
+#include "HistoryManager.h"
 #include "actionjsobject.h"
 #include "webpagedata.h"
 #include "wrtbrowsercontainer.h"
 #include "wrtbrowsercontainer_p.h"
 #include "webpagecontroller_p.h"
 #include <QWebDatabase>
 #include <QWebSettings>
 #include <QtCore/QSettings>
 using namespace WRT;
+#ifdef ORBIT_UI
+#include <shareui.h>
+#include <qcontactemailaddress.h>
+#include <xqaiwdeclplat.h>
+#include <xqaiwrequest.h>
+#include <xqappmgr.h>
+#endif // ORBIT_UI
 #if defined(Q_OS_SYMBIAN) // for shareToMail
 #include <miutset.h>
 #include <sendui.h>
 #include <cmessagedata.h>
 #include <txtrich.h>
 #include <SendUiConsts.h>
 const TUid KShareOnline = { 0x200009D5 };
 const TUid KShareOnOvi = { 0x2001AA43 };
 #endif
+#ifdef ORBIT_UI
+static const QString EMAIL_SEND_TO_KEY = "to";
+#endif // ORBIT_UI
 #define MAX_NUM_WINDOWS_TO_RESTORE 5
 #define MAX_NUM_WINDOWS 5
 static const char KHISTORYEXTENSION[]       = ".history";
+static const char KCOOKIESEXTENSION[]       = ".ini";
 WebPageControllerPrivate::WebPageControllerPrivate(WebPageController* qq) :
 q(qq),
 m_widgetParent(0),
 m_currentPage(-1),
 }
 else
 {
 	q->deleteDataFiles();
 }
-/*    #if defined(Q_OS_SYMBIAN)
 // clean up all pages
 while ( !m_allPages.isEmpty() )
 q->closePage(m_allPages.at(0));
 Q_ASSERT ( m_allPages.isEmpty() );
-#endif*/
 //    delete(m_widgetParent);
 }
 * @param page   WRT::WrtBrowserContainer instance to be closed
 * @see  WRT::WrtBrowserContainer
 */
 void WebPageController::closePage ( WRT::WrtBrowserContainer *page )
 {
-if(pageCount() > 1) {
 WRT::WrtBrowserContainer * theCurrentPage = currentPage();
 bool updateCurrentPageIndex = false;
 // get index of page we want to remove
 int closeIndex = d->m_allPages.indexOf(page);
 // was this page the "current page?"
 // if so, we need to select the page to become the new one
 // select the previous page unless at the beginning, then select next
 if(page == theCurrentPage) {
 int newCurrIndex = closeIndex - 1;
-if(closeIndex == 0 ) {
+if(closeIndex == 0 && pageCount() > 1) {
 newCurrIndex = closeIndex + 1;
 }
 // change the current page
 if(newCurrIndex >= 0) {
 setCurrentPage(theCurrentPage);
 updateCurrentPageIndex = true;
 }
 else {
 d->m_currentPage = -1;
-emit pageChanged(page, NULL);
 }
 }
 else {
 /* Adjust m_currentPage if the index of the page deleted is less than
 * current page
 // and emit sig that it was done
 emit pageDeleted(page);
 delete page;
-}
 }
 /*!
 *  Activate the given page as the current page
 *  @param page   page handle for setting current page
 connect( page, SIGNAL( loadProgress(int) ), SIGNAL( loadProgress(int) ) );
 connect( page, SIGNAL( loadFinished(bool) ), SLOT( onLoadFinished(bool) ) );
 connect( page, SIGNAL( databaseQuotaExceeded (QWebFrame *,QString) ), SLOT( onDatabaseQuotaExceeded (QWebFrame *,QString)) );
-connect( page->mainFrame(), SIGNAL( iconChanged() ), SIGNAL( pageIconChanged() ) );
+connect( page->mainFrame(), SIGNAL( iconChanged() ), this, SIGNAL( pageIconChanged() ) );
 connect( page->loadController(), SIGNAL( pageLoadStarted() ), SIGNAL( pageLoadStarted() ) );
 connect( page->loadController(), SIGNAL( pageLoadFailed() ), SIGNAL( pageLoadFailed() ) );
 connect( page->loadController(), SIGNAL( pageLoadProgress(int) ), SIGNAL( pageLoadProgress(int) ) );
 connect( page->loadController(), SIGNAL( pageLoadFinished(bool) ), SIGNAL( pageLoadFinished(bool) ) );
 connect( page->loadController(), SIGNAL( pageUrlChanged(QString) ), SIGNAL( pageUrlChanged(QString) ) );
 }
 void WebPageController::onDatabaseQuotaExceeded (QWebFrame *frame, QString database)
 {
-	QString  dbdir = QWebSettings::offlineStoragePath ();
+QString  dbdir = QWebSettings::offlineStoragePath ();
 QDir dir(dbdir);
 if(!dir.exists()||(dir.count() <= 1)) // empty DB
 	return;
 	{
 		QWebSecurityOrigin qwso = frame->securityOrigin();
 		qint64 quota = qwso.databaseQuota() ;
 		qint64 usage = qwso.databaseUsage() ;
 	}
-	m_promptMsg = "Database Quota Error";
+	//m_promptMsg = "Database Quota Error";
+m_promptMsg = qtTrId("txt_browser_error_database_quota");
 	emit databaseQuotaExceeded (frame, database);
 	return;
 }
 WRT::WrtBrowserContainer* page = qobject_cast<WRT::WrtBrowserContainer*> (sender());
 if (page){
 page->setUpdateThumbnail(true);
 // Current page is handled in onLoadFinished() so skip this case here
 if(page != currentPage()){
-			BookmarksManager::getSingleton()->addHistory(page->mainFrame()->url().toString(), page->pageTitle());
+			HistoryManager::getSingleton()->addHistory(page->mainFrame()->url().toString(), page->pageTitle());
 			emit (loadFinishedForBackgroundWindow(true,page));
 }
 	}
 }
 void WebPageController::updateHistory()
 {
-BookmarksManager::getSingleton()->addHistory(currentDocUrl(), currentDocTitle());
+HistoryManager::getSingleton()->addHistory(currentDocUrl(), currentDocTitle());
 emit(loadFinished(true));
 }
 /*!
 * Handling of network error happens signal
 Share the url through mail client
 */
 #if defined(Q_OS_SYMBIAN)
 void WebPageController::share(const QString &url)
 {
+#ifdef ORBIT_UI
+ShareUi *shareUi = new ShareUi();
+QStringList stringList;
+stringList << QString(url);
+shareUi->send(stringList,true);
+if(shareUi)
+delete shareUi;
+#else
 QString body = url;
 CSendUi* sendUi = CSendUi::NewLC();
 CMessageData* messageData = CMessageData::NewLC();
 TSendingCapabilities sendingCapabilities;
 bodyRichText->InsertL( 0, KNullDesC );
 messageData->SetBodyTextL( bodyRichText );
 sendUi->ShowQueryAndSendL(messageData, sendingCapabilities, array);
 CleanupStack::PopAndDestroy( 6 ); // bodyRichText, charFormat, paraFormat, messageData, sendUi
+#endif // ORBIT_UI
 }
 #else
 void WebPageController::share(const QString &url)
 {
 return; // Not supported
 Feedback from user
 */
 #if defined(Q_OS_SYMBIAN)
 void WebPageController::feedbackMail(const QString &mailAddress, const QString &mailBody)
 {
+#ifdef ORBIT_UI
+XQAiwRequest *sendRequest;
+XQApplicationManager appManager;
+QVariant retValue;
+sendRequest = appManager.create(XQI_EMAIL_MESSAGE_SEND, "send(QVariant)",true);
+	if(sendRequest) {
+QMap<QString, QVariant> map;
+QStringList recipients;
+	    QList<QVariant> data;
+	    recipients.append(mailAddress);
+		map.insert(EMAIL_SEND_TO_KEY, recipients);
+		data.append(map);
+		data << mailBody;
+		sendRequest->setArguments(data);
+		sendRequest->send(retValue);
+	}
+	if(sendRequest) {
+delete sendRequest;
+	}
+#else
 QString to = mailAddress;
 QString body = mailBody;
 CSendUi* sendUi = CSendUi::NewLC();
 CMessageData* messageData = CMessageData::NewLC();
 messageData->SetBodyTextL( bodyRichText );
 TRAP_IGNORE(sendUi->CreateAndSendMessageL( KUidMsgTypeSMTP, messageData ));
 //    TRAP_IGNORE(sendUi->CreateAndSendMessageL( KSenduiMtmSmsUid, messageData ));
 CleanupStack::PopAndDestroy( 5 );
+#endif //// ORBIT_UI
 }
 #else
 void WebPageController::feedbackMail(const QString &mailAddress, const QString &mailBody)
 {
 return; // Not supported
 WRT::WrtBrowserContainer* BrowserPageFactory::openBrowserPage()
 {
 return WebPageController::getSingleton()->openPage();
 }
+QString WebPageController::removeScheme(const QString & s) {
+return (WRT::UiUtil::removeScheme(s));
+}
 QString WebPageController::guessUrlFromString(const QString &s){
-	  QUrl u = WRT::UiUtil::guessUrlFromString(s);
+QUrl u = WRT::UiUtil::guessUrlFromString(s);
 return u.toString();
 }
 QString WebPageController::searchUrl(const QString &s){
 QUrl u = WRT::UiUtil::searchUrl(s);
 }
 }
 void WebPageController::deleteCookies()
 {
-	  QDir dir(d->m_historyDir);
+QDir dir(d->m_historyDir);
 QFileInfoList fileList(dir.entryInfoList(QDir::Files));
 QString indexStr;
 int index = 0;
 foreach (const QFileInfo fileInfo, fileList) {
 const QString filePath(fileInfo.absoluteFilePath());
-if (filePath.endsWith(QString(KHISTORYEXTENSION), Qt::CaseInsensitive)) {
+//if (filePath.endsWith(QString(KHISTORYEXTENSION), Qt::CaseInsensitive)) {
+	    if (filePath.endsWith(QString(KCOOKIESEXTENSION), Qt::CaseInsensitive)) {
 indexStr.setNum(index);
 QString cookiesFile = d->m_historyDir + QLatin1String("/cookies.ini");
 QFile file(cookiesFile);
 if(file.open(QIODevice::ReadOnly)) {
 file.remove();
 if(diskCacheDir.isEmpty())
 	return;
 //QDir dir1(d->m_historyDir +"/cwrtCache/http");
-QDir dir1(diskCacheDir + "/brCache/http");
+QDir dir1(diskCacheDir + "/http");
 QFileInfoList fileList1(dir1.entryInfoList(QDir::Files));
 foreach (const QFileInfo fileInfo, fileList1) {
 const QString filePath(fileInfo.absoluteFilePath());
 file.close();
 }
 }
 //QDir dir2(d->m_historyDir +"/cwrtCache/https");
-QDir dir2(diskCacheDir +"/brCache/https");
+QDir dir2(diskCacheDir +"/https");
 QFileInfoList fileList2(dir2.entryInfoList(QDir::Files));
 foreach (const QFileInfo fileInfo, fileList2) {
 const QString filePath(fileInfo.absoluteFilePath());
 void WebPageController::updatePageThumbnails()
 {
 // update current page's thumbnail forcely since the scrolling position may change
 WRT::WrtBrowserContainer *page = currentPage();
-QWebHistoryItem item = page->history()->currentItem();
+if(page) {
-page->savePageDataToHistoryItem(page->mainFrame(), &item);
+QWebHistoryItem item = page->history()->currentItem();
-page->setUpdateThumbnail(false);
+page->savePageDataToHistoryItem(page->mainFrame(), &item);
-checkAndUpdatePageThumbnails();
+page->setUpdateThumbnail(false);
+checkAndUpdatePageThumbnails();
+}
 }
 void WebPageController::resizeAndUpdatePageThumbnails(QSize& s)
 {
 webView()->resize(s); // resize the view
 //if (currentPage())
 return currentPage()->loadController()->mode();
 }
-void WebPageController::setLoadState(int mode) {
+void WebPageController::setEditMode(bool editing) {
 //qDebug() << __func__;
-currentPage()->loadController()->setMode((WRT::LoadController::GotoBrowserMode)mode);
+currentPage()->loadController()->setEditMode(editing);
 //qDebug() << __func__ << currentPage()->loadController()->mode();
+}
+bool WebPageController::editMode() {
+return (currentPage()->loadController()->editMode());
 }
 int WebPageController::loadProgressValue() {
 //qDebug()  << __func__ << currentPage()->loadController()->progressValue();

changeset 15	73c48011b8c7
parent 10	232fbd5a2dcb