Heads were merged
authorEugene Ostroukhov <eugeneo@symbian.org>
Wed, 10 Feb 2010 10:41:40 -0800
changeset 127 f095ed39206d
parent 124 71bbda100c42 (current diff)
parent 126 d496880b1e8b (diff)
child 128 511f7a424042
child 130 c5aaef2bcaf2
Heads were merged
org.symbian.tools.wrttools.previewer/icons/deploy_settings.gif
org.symbian.tools.wrttools.previewer/icons/deploy_widget.gif
org.symbian.tools.wrttools.previewer/icons/exclude_archive.gif
org.symbian.tools.wrttools.previewer/icons/include_archive.gif
org.symbian.tools.wrttools.previewer/icons/package_widget.gif
org.symbian.tools.wrttools.previewer/icons/upgrade-project-over.gif
org.symbian.tools.wrttools.previewer/icons/upgrade_project.gif
org.symbian.tools.wrttools.previewer/icons/upgrade_red.gif
org.symbian.tools.wrttools.previewer/icons/validate_widget.gif
org.symbian.tools.wrttools.previewer/preview/images/IconArea-hover.png
org.symbian.tools.wrttools.previewer/preview/images/active-orientation-icon.png
org.symbian.tools.wrttools.previewer/preview/images/battery-icon.png
org.symbian.tools.wrttools.previewer/preview/images/console-clear-button.png
org.symbian.tools.wrttools.previewer/preview/images/console-close-icon.png
org.symbian.tools.wrttools.previewer/preview/images/console-open-icon.png
org.symbian.tools.wrttools.previewer/preview/images/default-Icon.png
org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-landscape.png
org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-portrait.png
org.symbian.tools.wrttools.previewer/preview/images/errorIcon.png
org.symbian.tools.wrttools.previewer/preview/images/hs-iframeMask.png
org.symbian.tools.wrttools.previewer/preview/images/infoIcon.png
org.symbian.tools.wrttools.previewer/preview/images/memory-icon.png
org.symbian.tools.wrttools.previewer/preview/images/messaging-icon.png
org.symbian.tools.wrttools.previewer/preview/images/normal-orientation-icon.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_240x320.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_320x240.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_360x640.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_640x360.png
org.symbian.tools.wrttools.previewer/preview/images/statusBar_800x352.png
org.symbian.tools.wrttools.previewer/preview/images/sub-menu-arrow.png
org.symbian.tools.wrttools.previewer/preview/images/warningIcon.png
org.symbian.tools.wrttools.previewer/preview/images/wrt-help-icon.png
Binary file org.symbian.tools.wrttools.previewer/icons/deploy_settings.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/deploy_widget.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/exclude_archive.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/icon32.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/icon32_bkup.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/icon_bkup.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/include_archive.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/main16.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/main16_prev.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/package_widget.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/upgrade-project-over.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/upgrade_project.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/upgrade_red.gif has changed
Binary file org.symbian.tools.wrttools.previewer/icons/validate_widget.gif has changed
--- a/org.symbian.tools.wrttools.previewer/preview/css/style.css	Tue Feb 09 17:35:00 2010 -0800
+++ b/org.symbian.tools.wrttools.previewer/preview/css/style.css	Wed Feb 10 10:41:40 2010 -0800
@@ -46,12 +46,12 @@
 }
 
 #WidgetArea.hs_portrait{
-	background-image: url(../images/device/360x640/hs-portrait.png);
+	background-image: url(../images/device/360x640/hs-portrait.gif);
 	background-repeat: no-repeat;
 }
 
 #WidgetArea.hs_landscape{
-	background-image: url(../images/device/360x640/hs-landscape.png);
+	background-image: url(../images/device/360x640/hs-landscape.gif);
 	background-repeat: no-repeat;
 }
 #WidgetArea.hs_portrait iframe{
@@ -76,7 +76,8 @@
 	height: 100px;
 	position: absolute;
 	z-index: 900;
-	background-image: url(../images/hs-iframeMask.png);
+	background-image: url(../images/hs-iframeMask.gif
+	);
 	background-repeat: no-repeat;
 	background-position: top left;
 }
@@ -257,7 +258,7 @@
 }
 
 div.IconFile:hover{
-	background-image: url(../images/IconArea-hover.png);
+	background-image: url(../images/IconArea-hover.gif);
 	background-position: center center;
 	background-repeat: no-repeat;
 }
@@ -315,7 +316,7 @@
 }
 
 div#orientationIcon{
-	background-image: url(../images/normal-orientation-icon.png);
+	background-image: url(../images/normal-orientation-icon.gif);
 	background-repeat: no-repeat;
 	width: 191px;
 	height: 72px;
@@ -326,7 +327,7 @@
 	display: none;
 }
 div#orientationIcon:hover{
-	background-image: url(../images/active-orientation-icon.png);
+	background-image: url(../images/active-orientation-icon.gif);
 }
 
 table{
@@ -450,15 +451,15 @@
 
 
 div#event-battery{
-	background-image: url(../images/battery-icon.png);
+	background-image: url(../images/battery-icon.gif);
 }
 
 div#event-messaging{
-	background-image: url(../images/messaging-icon.png);
+	background-image: url(../images/messaging-icon.gif);
 }
 
 div#event-memory{
-	background-image: url(../images/memory-icon.png);
+	background-image: url(../images/memory-icon.gif);
 }
 
 div.ui-panel{
@@ -532,7 +533,7 @@
 
 span#Console-Toggle-Button.open{
 	background-position: 0px 0px;
-	background-image: url(../images/console-close-icon.png);
+	background-image: url(../images/console-close-icon.gif);
 }
 
 span#Console-Toggle-Button.open:hover{
@@ -546,7 +547,7 @@
 
 span#Console-Toggle-Button.close{
 	background-position: 0px 0px;
-	background-image: url(../images/console-open-icon.png);
+	background-image: url(../images/console-open-icon.gif);
 }
 
 span#Console-Toggle-Button.close:hover{
@@ -590,19 +591,19 @@
 }
 
 #preview-ui-bottom-body p.info{
-	background-image: url(../images/infoIcon.png);
+	background-image: url(../images/infoIcon.gif);
 	background-repeat: no-repeat;
 	background-position: 5px center;
 	padding-left: 26px;
 }
 #preview-ui-bottom-body p.warn{
-	background: #00ffff url(../images/warningIcon.png);
+	background: #00ffff url(../images/warningIcon.gif);
 	background-repeat: no-repeat;
 	background-position: 5px center;
 	padding-left: 26px;
 }
 #preview-ui-bottom-body p.error{
-	background: #ffffe0 url(../images/errorIcon.png);
+	background: #ffffe0 url(../images/errorIcon.gif);
 	background-repeat: no-repeat;
 	background-position: 5px center;
 	padding-left: 26px;
Binary file org.symbian.tools.wrttools.previewer/preview/images/BrowserNotificationBar-Toogle.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/BrowserNotificationBar-Toogle_bkup.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/IconArea-hover.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/IconArea-hover.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/IconArea-hover_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/active-orientation-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/active-orientation-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/active-orientation-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/battery-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/battery-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/battery-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-clear-button.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-clear-button.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-clear-button_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-close-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-close-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-close-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-icon_new.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-open-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-open-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/console-open-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/default-Icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/default-Icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/default-Icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-landscape.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-landscape.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-landscape_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-portrait.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-portrait.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/device/360x640/hs-portrait_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/errorIcon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/errorIcon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/errorIcon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/hs-iframeMask.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/hs-iframeMask.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/hs-iframeMask_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/infoIcon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/infoIcon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/infoIcon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/memory-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/memory-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/memory-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/messaging-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/messaging-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/messaging-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/normal-orientation-icon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/normal-orientation-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/normal-orientation-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/settings-icon_new.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_240x320.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_240x320.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_240x320_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_320x240.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_320x240.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_320x240_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_360x640.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_360x640.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_360x640_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_640x360.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_640x360.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_640x360_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_800x352.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_800x352.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/statusBar_800x352_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/sub-menu-arrow.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/sub-menu-arrow.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/sub-menu-arrow_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/warningIcon.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/warningIcon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/warningIcon_bkup.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/wrt-help-con.gif has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/wrt-help-icon.png has changed
Binary file org.symbian.tools.wrttools.previewer/preview/images/wrt-help-icon_bkup.png has changed
Binary file org.symbian.tools.wrttools.product/icons/main16.gif has changed
Binary file org.symbian.tools.wrttools.product/icons/main16_bkup.gif has changed
Binary file org.symbian.tools.wrttools.product/icons/main16_prev.gif has changed
Binary file org.symbian.tools.wrttools/icons/deploy_settings.gif has changed
Binary file org.symbian.tools.wrttools/icons/deploy_widget.gif has changed
Binary file org.symbian.tools.wrttools/icons/exclude_archive.gif has changed
Binary file org.symbian.tools.wrttools/icons/import_aptana_project.gif has changed
Binary file org.symbian.tools.wrttools/icons/include_archive.gif has changed
Binary file org.symbian.tools.wrttools/icons/main16.gif has changed
Binary file org.symbian.tools.wrttools/icons/main16_bkup.gif has changed
Binary file org.symbian.tools.wrttools/icons/main16_prev.gif has changed
Binary file org.symbian.tools.wrttools/icons/package_report.gif has changed
Binary file org.symbian.tools.wrttools/icons/package_widget.gif has changed
Binary file org.symbian.tools.wrttools/icons/package_widget_bkup.gif has changed
Binary file org.symbian.tools.wrttools/icons/validate_widget.gif has changed
Binary file org.symbian.tools.wrttools/icons/validate_widget_bkup.gif has changed
--- a/org.symbian.tools.wrttools/plugin.xml	Tue Feb 09 17:35:00 2010 -0800
+++ b/org.symbian.tools.wrttools/plugin.xml	Wed Feb 10 10:41:40 2010 -0800
@@ -167,7 +167,7 @@
 		<wizard category="org.symbian.tools.wrttools.core.category"
 			class="org.symbian.tools.wrttools.wizards.AptanaProjectsImportWizard"
 			finalPerspective="org.symbian.tools.wrttools.mainPerspective"
-			hasPages="true" icon="icons/main16.gif"
+			hasPages="true" icon="icons/import_aptana_project.gif"
 			id="org.symbian.tools.wrttools.newImportAptanaProject" name="Import Aptana IDE WRT Project"
 			project="true">
 		</wizard>
@@ -242,7 +242,7 @@
 		</category>
 		<wizard category="org.symbian.tools.wrttools.import"
 			class="org.symbian.tools.wrttools.wizards.AptanaProjectsImportWizard"
-			icon="icons/main16.gif" id="org.symbian.tools.wrttools.import.aptanaImport"
+			icon="icons/import_aptana_project.gif" id="org.symbian.tools.wrttools.import.aptanaImport"
 			name="Aptana IDE WRT Project">
 		</wizard>
        <wizard
@@ -399,6 +399,23 @@
           </or>
        </possibleChildren>
        <actionProvider
+             class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorViewActionProvider"
+             id="org.eclipse.wst.jsdt.ui.navigator.actions.ViewActions">
+          <enablement>
+             <or>
+                <instanceof
+                      value="org.eclipse.core.resources.IWorkspaceRoot">
+                </instanceof>
+                <adapt
+                      type="java.util.Collection">
+                   <count
+                         value="0">
+                   </count>
+                </adapt>
+             </or>
+          </enablement>
+       </actionProvider>
+       <actionProvider
              class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorActionProvider"
              id="org.eclipse.wst.jsdt.ui.navigator.actions.StandardActions">
 <!--          <enablement>
@@ -433,8 +450,35 @@
        <actionProvider
              class="org.eclipse.wst.jsdt.internal.ui.navigator.JavaNavigatorRefactorActionProvider"
              id="org.eclipse.wst.jsdt.ui.navigator.actions.RefactorActions"
-             overrides="org.eclipse.ui.navigator.resources.actions.RefactorActions"
-             priority="high">
+             overrides="org.eclipse.ui.navigator.resources.actions.RefactorActions">
+          <enablement>
+             <or>
+                <and>
+                   <instanceof
+                         value="org.eclipse.core.resources.IProject">
+                   </instanceof>
+                   <test
+                         property="org.eclipse.core.resources.projectNature"
+                         value="org.symbian.tools.wrttools.WidgetProjectNature">
+                   </test>
+                </and>
+                <instanceof
+                      value="org.eclipse.wst.jsdt.core.IJavaScriptElement">
+                </instanceof>
+                <instanceof
+                      value="org.eclipse.wst.jsdt.core.IJarEntryResource">
+                </instanceof>
+                <instanceof
+                      value="org.eclipse.wst.jsdt.internal.ui.packageview.PackageFragmentRootContainer">
+                </instanceof>
+                <adapt
+                      type="java.util.Collection">
+                   <count
+                         value="0">
+                   </count>
+                </adapt>
+             </or>
+          </enablement>
        </actionProvider>
        <actionProvider
              class="org.eclipse.wst.jsdt.internal.ui.navigator.PackageExplorerOpenActionProvider"