Replace camera "screen" with more generic one.
authorEugene Ostroukhov <eugeneo@symbian.org>
Tue, 13 Jul 2010 17:32:32 -0700
changeset 444 6eb42310f8b5
parent 443 c5a1d477afa1
child 445 423889d5d6d3
Replace camera "screen" with more generic one.
org.symbian.tools.wrttools.previewer/preview/css/style.css
org.symbian.tools.wrttools.previewer/preview/images/default-Icon_bkup.png
org.symbian.tools.wrttools.previewer/preview/images/inspector.png
org.symbian.tools.wrttools.previewer/preview/images/inspector_hover.png
org.symbian.tools.wrttools.previewer/preview/images/settings_1.png
org.symbian.tools.wrttools.previewer/preview/images/settings_2.png
org.symbian.tools.wrttools.previewer/preview/images/settings_hover.png
org.symbian.tools.wrttools.previewer/preview/images/settings_icon.png
org.symbian.tools.wrttools.previewer/preview/script/helper.js
org.symbian.tools.wrttools.previewer/preview/script/layout.js
org.symbian.tools.wrttools.previewer/preview/script/lib/widget.js
org.symbian.tools.wrttools.previewer/preview/wrt_preview.html
--- a/org.symbian.tools.wrttools.previewer/preview/css/style.css	Tue Jul 13 15:27:46 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css	Tue Jul 13 17:32:32 2010 -0700
@@ -795,4 +795,12 @@
 
 #Console-Notification:HOVER {
 	background-image: url(../script/jquery-ui/css/ui-darkness/images/ui-icons_ffffff_256x240.png);
-}
\ No newline at end of file
+}
+
+#external-app-icon {
+	margin-top: 20%;
+	height: 80px;
+	background-repeat: no-repeat;
+	background-position: center;	
+}
+
Binary file org.symbian.tools.wrttools.previewer/preview/images/default-Icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/inspector.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/inspector_hover.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings_1.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings_2.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings_hover.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings_icon.png has changed
--- a/org.symbian.tools.wrttools.previewer/preview/script/helper.js	Tue Jul 13 15:27:46 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/preview/script/helper.js	Tue Jul 13 17:32:32 2010 -0700
@@ -456,8 +456,7 @@
 			});
 	$("#slider-value-panel > span").html("10%");
 
-	var cc = $("#close-camera");
-	cc.click(NOKIA.helper.hideCamera);
+	$("#external-app-close").button().click(NOKIA.layout.closeApplication);
 	// Bind Buttons to trigger values to WRT 1.0 / 1.1 bindings
 
 	$("#connect-charger").click(NOKIA.helper.triggerEvents);
@@ -508,16 +507,6 @@
 	return count;
 };
 
-EmulatorHelper.prototype.showCamera = function() {
-	$("#camera").show();
-	$("#WidgetArea").hide();
-};
-
-EmulatorHelper.prototype.hideCamera = function() {
-	$("#camera").hide();
-	$("#WidgetArea").show();
-};
-
 EmulatorHelper.prototype.triggerEvents = function(event) {
 	if (typeof event.target.id == 'undefined')
 		return false;
--- a/org.symbian.tools.wrttools.previewer/preview/script/layout.js	Tue Jul 13 15:27:46 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/preview/script/layout.js	Tue Jul 13 17:32:32 2010 -0700
@@ -142,4 +142,30 @@
 			display : 'block'
 		});
 	}
+};
+
+EmulatorLayout.prototype.openApplication = function(icon, message) {
+	var iconDiv = $("#external-app-icon");
+	if (icon && icon != null) {
+		iconDiv.css("background-image", "url('" + icon + "')");
+		iconDiv.show();
+	} else {
+		iconDiv.hide();
+	}
+	var messageDiv = $("#external-app-description");
+	if (message && message != null) {
+		messageDiv.html(message);
+		messageDiv.show();
+	} else {
+		messageDiv.hide();
+	}
+	$("#externalapp").show();
+	$("#WidgetArea").hide();
+	$("#SoftKeysArea").hide();
+};
+
+EmulatorLayout.prototype.closeApplication = function() {
+	$("#externalapp").hide();
+	$("#WidgetArea").show();
+	$("#SoftKeysArea").show();
 };
\ No newline at end of file
--- a/org.symbian.tools.wrttools.previewer/preview/script/lib/widget.js	Tue Jul 13 15:27:46 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/preview/script/lib/widget.js	Tue Jul 13 17:32:32 2010 -0700
@@ -106,10 +106,9 @@
 	 */
 	widget.openApplication = function(Uid, param){
 		if (Uid == 270501242) { // Camera
-			var help = _BRIDGE_REF.nokia.helper;
-			help.showCamera();
+			_BRIDGE_REF.nokia.layout.openApplication("preview/images/camera.png");
 		} else {
-			alert("openApplication function won't be simulated in this application");
+			_BRIDGE_REF.nokia.layout.openApplication("Application UID: " + Uid + "Parameters are: " + param);
 		}
 	};
 	
--- a/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html	Tue Jul 13 15:27:46 2010 -0700
+++ b/org.symbian.tools.wrttools.previewer/preview/wrt_preview.html	Tue Jul 13 17:32:32 2010 -0700
@@ -45,10 +45,11 @@
 						<div id="iframeMask" class="hide"></div>
 						<iframe src=""></iframe>
 					</div>
-					<div id="camera" class="hide">
-						<img src="preview/images/camera.png"/>
-						<div>
-						<a id="close-camera" class="ui-button" href="javascript:void(0);">Return to Widget</a>
+					<div id="externalapp" class="hide">
+						<div id="external-app-icon"></div>
+						<div id="external-app-description"></div>
+						<div style="text-align: center; margin-top: 30px">
+							<span id="external-app-close">Close</span>
 						</div>
 					</div>
 					<div id="MenuItemsArea" class="scroll-pane">