114 |
114 |
115 #ifdef ORBIT_UI |
115 #ifdef ORBIT_UI |
116 #include <hbapplication.h> |
116 #include <hbapplication.h> |
117 #endif // ORBIT_UI |
117 #endif // ORBIT_UI |
118 |
118 |
119 #ifdef PLAT_101 |
119 #ifdef OPENURL |
120 #include "BrowserMainS60.h" |
120 #include "BrowserMainS60.h" |
121 |
121 |
122 static CApaApplication *AppFactoryL() |
122 static CApaApplication *AppFactoryL() |
123 { |
123 { |
124 return(BrowserMainApplicationS60::Instance()); |
124 return(&CBrowserMainAppSingleton::Instance()); |
125 } |
125 } |
126 #endif |
126 #endif // OPENURL |
127 |
127 |
128 |
128 |
129 static void configureHtml5OfflineStorage() |
129 static void configureHtml5OfflineStorage() |
130 { |
130 { |
131 BEDROCK_PROVISIONING::BedrockProvisioning * provisioning = |
131 BEDROCK_PROVISIONING::BedrockProvisioning * provisioning = |
213 // qDebug() << "main - argv[" << i << "] = " << argv[i]; |
213 // qDebug() << "main - argv[" << i << "] = " << argv[i]; |
214 // } |
214 // } |
215 |
215 |
216 /* openurl should only work in Orbit UI application. */ |
216 /* openurl should only work in Orbit UI application. */ |
217 #ifdef ORBIT_UI |
217 #ifdef ORBIT_UI |
218 #ifdef PLAT_101 |
218 #ifdef OPENURL |
219 #ifdef NO_QSTM_GESTURE |
219 #ifdef NO_QSTM_GESTURE |
220 HbApplication app(AppFactoryL, argc, argv); |
220 HbApplication app(AppFactoryL, argc, argv); |
221 #else |
221 #else |
222 BrowserApp app(AppFactoryL, argc, argv); |
222 BrowserApp app(AppFactoryL, argc, argv); |
223 #endif |
223 #endif |
224 #else /* !PLAT_101 */ |
224 #else /* !OPENURL */ |
225 #ifdef NO_QSTM_GESTURE |
225 #ifdef NO_QSTM_GESTURE |
226 HbApplication app(argc, argv); |
226 HbApplication app(argc, argv); |
227 #else // ORBIT_UI |
227 #else // ORBIT_UI |
228 BrowserApp app(argc, argv); |
228 BrowserApp app(argc, argv); |
229 #endif |
229 #endif |
230 #endif /* PLAT_101 */ |
230 #endif /* OPENURL */ |
231 #else |
231 #else |
232 #ifdef NO_QSTM_GESTURE |
232 #ifdef NO_QSTM_GESTURE |
233 QApplication app(argc, argv); |
233 QApplication app(argc, argv); |
234 #else |
234 #else |
235 BrowserApp app(argc, argv); |
235 BrowserApp app(argc, argv); |
275 /* |
275 /* |
276 #ifdef Q_OS_SYMBIAN |
276 #ifdef Q_OS_SYMBIAN |
277 QApplication::setKeypadNavigationEnabled(true); |
277 QApplication::setKeypadNavigationEnabled(true); |
278 #endif |
278 #endif |
279 */ |
279 */ |
280 #ifdef PLAT_101 |
280 #ifdef OPENURL |
281 // Handle QDesktopServices.openUrl (when browser wasn't already running) |
281 // Handle QDesktopServices.openUrl (when browser wasn't already running) |
282 QString url = BrowserMainApplicationS60::Instance()->InitialUrl(); |
282 QString url = CBrowserMainAppSingleton::Instance().InitialUrl(); |
283 qDebug() << "main - initialurl = " << url; |
|
284 GinebraBrowser * browser = new GinebraBrowser(0, &url); // Pass the initial url so it will be loaded as soon as the browser chrome finishes |
283 GinebraBrowser * browser = new GinebraBrowser(0, &url); // Pass the initial url so it will be loaded as soon as the browser chrome finishes |
285 // Set things up to handle QDesktopServices.openUrl calls when browser is already running |
284 // Set things up to handle QDesktopServices.openUrl calls when browser is already running |
286 BrowserMainApplicationS60::Instance()->setUrlHandler(browser); |
285 CBrowserMainAppSingleton::Instance().setUrlHandler(browser); |
287 #else |
286 #else |
288 GinebraBrowser * browser = new GinebraBrowser(); |
287 GinebraBrowser * browser = new GinebraBrowser(); |
289 #endif |
288 #endif |
290 |
289 |
291 |
290 |