# HG changeset patch
# User tasneems@symbian.org
# Date 1265929237 28800
# Node ID 22c6da0edf5d089b9357330a600b4f3e0a5b6183
# Parent  058151c7f9e62fd6bed10b7ecf92d3876326a270# Parent  33876f868ea36cea2efab2e9440555a827dd2115
Merged

diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/icons/obj16/preview_view.gif
Binary file org.symbian.tools.wrttools.previewer/icons/obj16/preview_view.gif has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/icons/obj16/refresh_green_new.gif
Binary file org.symbian.tools.wrttools.previewer/icons/obj16/refresh_green_new.gif has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/icons/obj16/refresh_new.gif
Binary file org.symbian.tools.wrttools.previewer/icons/obj16/refresh_new.gif has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/plugin.xml
--- a/org.symbian.tools.wrttools.previewer/plugin.xml	Thu Feb 11 14:29:07 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/plugin.xml	Thu Feb 11 15:00:37 2010 -0800
@@ -7,7 +7,7 @@
             allowMultiple="false"
             category="org.symbian.tools.wrttools.views"
             class="org.symbian.tools.wrttools.previewer.preview.PreviewView"
-            icon="icons/obj16/html-editor.gif"
+            icon="icons/obj16/preview_view.gif"
             id="org.symbian.tools.wrttools.editing.wrtpreview"
             name="WRT Preview"
             restorable="true">
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/preview/css/style.css
--- a/org.symbian.tools.wrttools.previewer/preview/css/style.css	Thu Feb 11 14:29:07 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css	Thu Feb 11 15:00:37 2010 -0800
@@ -451,7 +451,7 @@
 
 
 div#event-battery{
-	background-image: url(../images/battery-icon.gif);
+	background-image: url(../images/battery-icon.png);
 }
 
 div#event-messaging{
@@ -459,7 +459,7 @@
 }
 
 div#event-memory{
-	background-image: url(../images/memory-icon.gif);
+	background-image: url(../images/memory-icon.png);
 }
 
 div.ui-panel{
@@ -533,7 +533,7 @@
 
 span#Console-Toggle-Button.open{
 	background-position: 0px 0px;
-	background-image: url(../images/console-close-icon_bkup.gif);
+	background-image: url(../images/console-close-icon.gif);
 }
 
 span#Console-Toggle-Button.open:hover{
@@ -547,7 +547,7 @@
 
 span#Console-Toggle-Button.close{
 	background-position: 0px 0px;
-	background-image: url(../images/console-open-icon_bkup.gif);
+	background-image: url(../images/console-open-icon.gif);
 }
 
 span#Console-Toggle-Button.close:hover{
@@ -563,7 +563,7 @@
 	height: 16px;
 	width: 39px;
 	float: right;
-	background-image: url(../images/console-clear-button.png);
+	background-image: url(../images/console-clear-button.gif);
 	background-repeat: no-repeat;
 	margin : 10px 10px 0px 0px;
 	cursor: hand;
@@ -626,7 +626,7 @@
 	width: 28px;
 	float: right;
 	background-repeat: no-repeat;
-	background-image: url(../images/wrt-help-icon.png);
+	background-image: url(../images/wrt-help-icon.gif);
 }
 
 span#wrt-help:hover{
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/preview/images/battery-icon.png
Binary file org.symbian.tools.wrttools.previewer/preview/images/battery-icon.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/preview/images/memory-icon.png
Binary file org.symbian.tools.wrttools.previewer/preview/images/memory-icon.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/preview/images/settings-icon.png
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings-icon.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.previewer/preview/images/settings-icon_bkup.png
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings-icon_bkup.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.product/icons/WRT_32px_01.png
Binary file org.symbian.tools.wrttools.product/icons/WRT_32px_01.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.product/icons/WRT_Wizard_banner.png
Binary file org.symbian.tools.wrttools.product/icons/WRT_Wizard_banner.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.product/icons/WRT_main16.png
Binary file org.symbian.tools.wrttools.product/icons/WRT_main16.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.product/icons/WRT_main_16.png
Binary file org.symbian.tools.wrttools.product/icons/WRT_main_16.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.product/plugin.xml
--- a/org.symbian.tools.wrttools.product/plugin.xml	Thu Feb 11 14:29:07 2010 -0800
+++ b/org.symbian.tools.wrttools.product/plugin.xml	Thu Feb 11 15:00:37 2010 -0800
@@ -91,10 +91,6 @@
             activityId="org.symbian.tools.wrttools.product.wtp"
             pattern="org\.eclipse\.wst\.jsdt\.web\.ui/org\.eclipse\.wst\.jsdt\.internal\.web\.ui\.convertProjects">
       </activityPatternBinding>
-      <activityPatternBinding
-            activityId="org.symbian.tools.wrttools.product.wtp"
-            pattern="org\.eclipse\.debug\.ui/org\.eclipse\.debug\.ui\.contextualLaunch\.profile\.submenu">
-      </activityPatternBinding>
       <category
             description="WTP UI elements that are not compatible with WRT widget development"
             id="org.symbian.tools.wrttools.product.wtp"
@@ -131,15 +127,15 @@
             name="WebRuntime Toolkit IDE">
          <property
                name="windowImages"
-               value="icons/main16.gif,eclipse32.gif,eclipse48.gif,eclipse.png,eclipse32.png">
+               value="icons/WRT_main_16.png,icons/WRT_32px_01.png,eclipse48.gif,eclipse.png,eclipse32.png">
          </property>
          <property
                name="aboutText"
-               value="%productBlurb">
+               value="Symbian Foundation's Open Source toolkit for developing and deploying Web applications">
          </property>
          <property
                name="aboutImage"
-               value="eclipse_lg.gif">
+               value="icons/WRT_Wizard_banner.png">
          </property>
          <property
                name="startupForegroundColor"
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools.product/wrt-ide.product
--- a/org.symbian.tools.wrttools.product/wrt-ide.product	Thu Feb 11 14:29:07 2010 -0800
+++ b/org.symbian.tools.wrttools.product/wrt-ide.product	Thu Feb 11 15:00:37 2010 -0800
@@ -4,9 +4,10 @@
 <product name="WebRuntime Toolkit IDE" uid="org.symbian.wrtide" id="org.symbian.tools.wrttools.product.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
 
    <aboutInfo>
-      <image path="eclipse_lg.gif"/>
+      <image path="icons/WRT_Wizard_banner.png"/>
       <text>
-         %productBlurb
+         Symbian Foundation&apos;s Open Source toolkit for
+developing and deploying Web applications
       </text>
    </aboutInfo>
 
@@ -19,7 +20,7 @@
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
    </launcherArgs>
 
-   <windowImages i16="/org.symbian.tools.wrttools.product/icons/main16.gif" i32="eclipse32.gif" i48="eclipse48.gif" i64="eclipse.png" i128="eclipse32.png"/>
+   <windowImages i16="/org.symbian.tools.wrttools.product/icons/WRT_main_16.png" i32="/org.symbian.tools.wrttools.product/icons/WRT_32px_01.png" i48="eclipse48.gif" i64="eclipse.png" i128="eclipse32.png"/>
 
    <splash
       startupProgressRect="0,280,455,15"
@@ -32,6 +33,7 @@
       </win>
    </launcher>
 
+
    <vm>
       <macos>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5</macos>
       <windows>org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6</windows>
@@ -46,7 +48,7 @@
       <plugin id="javax.servlet.jsp"/>
       <plugin id="javax.transaction" fragment="true"/>
       <plugin id="javax.xml"/>
-      <plugin id="javax.xml.stream"/>
+      <plugin id="javax.xml.stream" fragment=""/>
       <plugin id="org.apache.bcel"/>
       <plugin id="org.apache.commons.codec"/>
       <plugin id="org.apache.commons.collections"/>
@@ -56,7 +58,7 @@
       <plugin id="org.apache.commons.jxpath"/>
       <plugin id="org.apache.commons.lang" version="2.3.0.v200803061910"/>
       <plugin id="org.apache.commons.logging"/>
-      <plugin id="org.apache.commons.net"/>
+      <plugin id="org.apache.commons.net" fragment=""/>
       <plugin id="org.apache.jasper"/>
       <plugin id="org.apache.log4j"/>
       <plugin id="org.apache.lucene"/>
@@ -280,7 +282,7 @@
       <plugin id="org.eclipse.wst.xml.xpath.ui"/>
       <plugin id="org.eclipse.wst.xml.xpath2.processor"/>
       <plugin id="org.eclipse.wst.xmleditor.doc.user"/>
-      <plugin id="org.eclipse.wtp.epp.package.jee.intro"/>
+      <plugin id="org.eclipse.wtp.epp.package.jee.intro" fragment=""/>
       <plugin id="org.jdom"/>
       <plugin id="org.mortbay.jetty.server"/>
       <plugin id="org.mortbay.jetty.util"/>
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/icons/WRT_1.0_1.png
Binary file org.symbian.tools.wrttools/icons/WRT_1.0_1.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/icons/WRT_1.0_2.png
Binary file org.symbian.tools.wrttools/icons/WRT_1.0_2.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/icons/WRT_32px_01.png
Binary file org.symbian.tools.wrttools/icons/WRT_32px_01.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/icons/WRT_32px_02.png
Binary file org.symbian.tools.wrttools/icons/WRT_32px_02.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/icons/WRT_main16.png
Binary file org.symbian.tools.wrttools/icons/WRT_main16.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/icons/WRT_main_16.png
Binary file org.symbian.tools.wrttools/icons/WRT_main_16.png has changed
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/plugin.xml
--- a/org.symbian.tools.wrttools/plugin.xml	Thu Feb 11 14:29:07 2010 -0800
+++ b/org.symbian.tools.wrttools/plugin.xml	Thu Feb 11 15:00:37 2010 -0800
@@ -35,7 +35,7 @@
         <extension
               point="org.eclipse.ui.ide.projectNatureImages">
            <image
-                 icon="icons/main16.gif"
+                 icon="icons/WRT_main_16.png"
                  id="org.symbian.tools.wrttools.natureImage"
                  natureId="org.symbian.tools.wrttools.WidgetProjectNature">
            </image>
@@ -156,7 +156,7 @@
 		<wizard category="org.symbian.tools.wrttools.core.category"
 			class="org.symbian.tools.wrttools.wizards.WrtWidgetWizard"
 			finalPerspective="org.symbian.tools.wrttools.mainPerspective"
-			hasPages="true" icon="icons/main16.gif"
+			hasPages="true" icon="icons/WRT_main_16.png"
 			id="org.symbian.tools.wrttools.core.wrtwidgetwizard" name="Web Runtime Application"
 			project="true">
 			<description>
@@ -195,7 +195,7 @@
             default-css-name="HelloWithWRTKit"
             default-html-name="index"
             default-js-name="HelloWithWRTKit"
-            icon="icons/main16.gif"
+            icon="icons/WRT_main_16.png"
             id-pattern="com.{0}.helloWithWRTKit.widget"
             wizard-page-factory="org.symbian.tools.wrttools.wizards.HelloWithWRTKitProjectDetailsWizardPage$Factory">
          <description>
diff -r 33876f868ea3 -r 22c6da0edf5d org.symbian.tools.wrttools/projecttemplates/flickr.zip
Binary file org.symbian.tools.wrttools/projecttemplates/flickr.zip has changed