Permalink
Browse files

Upgrades to various icons and graphics to make them blend in better.

Ignore-this: 15aac23d659417452751170f88cfa52

darcs-hash:20090619185329-04e1b-3d6c5482af615f3c29f0d789cf74bf3bf4379857.gz
  • Loading branch information...
1 parent 2e5a7ec commit de167a34c3676c1f80c155ed9aa6319afd789268 @ttencate ttencate committed Jun 19, 2009
Showing with 97 additions and 13 deletions.
  1. BIN net.sf.eclipsefp.haskell.ui/icon-src/emptyfile_obj.xcf
  2. +79 −0 net.sf.eclipsefp.haskell.ui/icon-src/haskell-logo.svg
  3. BIN net.sf.eclipsefp.haskell.ui/icon-src/haskell_ovr.xcf
  4. BIN net.sf.eclipsefp.haskell.ui/icon-src/hsfile_obj.xcf
  5. BIN net.sf.eclipsefp.haskell.ui/icon-src/hsicon16.xcf
  6. BIN net.sf.eclipsefp.haskell.ui/icon-src/impcprj_wiz.xcf
  7. BIN net.sf.eclipsefp.haskell.ui/icon-src/lhsfile_obj.xcf
  8. BIN net.sf.eclipsefp.haskell.ui/icon-src/newhprj_wiz.xcf
  9. BIN net.sf.eclipsefp.haskell.ui/icons/dtool16/configurator.gif
  10. BIN net.sf.eclipsefp.haskell.ui/icons/etool16/configurator.gif
  11. BIN net.sf.eclipsefp.haskell.ui/icons/etool16/haskellNature.gif
  12. BIN net.sf.eclipsefp.haskell.ui/icons/etool16/haskell_misc.gif
  13. BIN net.sf.eclipsefp.haskell.ui/icons/etool16/hsicon16.gif
  14. BIN net.sf.eclipsefp.haskell.ui/icons/etool16/impcprj_wiz.gif
  15. BIN net.sf.eclipsefp.haskell.ui/icons/etool16/newhprj_wiz.gif
  16. BIN net.sf.eclipsefp.haskell.ui/icons/obj16/hsfile_obj.gif
  17. BIN net.sf.eclipsefp.haskell.ui/icons/obj16/lhsfile_obj.gif
  18. BIN net.sf.eclipsefp.haskell.ui/icons/obj16/litsrcfile.gif
  19. BIN net.sf.eclipsefp.haskell.ui/icons/obj16/srcfile.gif
  20. BIN net.sf.eclipsefp.haskell.ui/icons/obj16/srcfolder.gif
  21. BIN net.sf.eclipsefp.haskell.ui/icons/obj16/srcfolder_obj.gif
  22. BIN net.sf.eclipsefp.haskell.ui/icons/ovr16/haskell_ovr.gif
  23. BIN net.sf.eclipsefp.haskell.ui/icons/wizban/{importcabalpkg.png → impcprj_wiz.png}
  24. BIN net.sf.eclipsefp.haskell.ui/icons/wizban/newhprj_wiz.png
  25. BIN net.sf.eclipsefp.haskell.ui/icons/wizban/newproject.gif
  26. +7 −6 net.sf.eclipsefp.haskell.ui/plugin.xml
  27. +2 −2 ...ui/src/net/sf/eclipsefp/haskell/ui/internal/views/projectexplorer/HaskellResourceExtensionLP.java
  28. +2 −0 ....eclipsefp.haskell.ui/src/net/sf/eclipsefp/haskell/ui/internal/wizards/ProjectCreationWizard.java
  29. +7 −5 net.sf.eclipsefp.haskell.ui/src/net/sf/eclipsefp/haskell/ui/util/HaskellUIImages.java
Binary file not shown.
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="481.8897pt"
+ height="340.1574pt"
+ viewBox="0 0 481.89 340.157"
+ version="1.1"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ sodipodi:docname="haskell-logo.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <metadata
+ id="metadata21">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ inkscape:window-height="480"
+ inkscape:window-width="640"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ guidetolerance="10.0"
+ gridtolerance="10.0"
+ objecttolerance="10.0"
+ borderopacity="1.0"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ showgrid="false"
+ inkscape:zoom="1.4274501"
+ inkscape:cx="182.19837"
+ inkscape:cy="200.57824"
+ inkscape:current-layer="svg2" />
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 212.59839 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="602.36212 : 212.59839 : 1"
+ inkscape:persp3d-origin="301.18106 : 141.73226 : 1"
+ id="perspective23" />
+ <clipPath
+ id="clip1">
+ <path
+ d="M 0 340.15625 L 481.890625 340.15625 L 481.890625 0 L 0 0 L 0 340.15625 Z M 0 340.15625 "
+ id="path7" />
+ </clipPath>
+ </defs>
+ <path
+ style="fill:#286296;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="M 0,340.15625 L 113.38672,170.07812 L 0,0 L 85.039062,0 L 198.42578,170.07812 L 85.039062,340.15625 L 0,340.15625 z"
+ id="path12" />
+ <path
+ style="fill:#b3d0eb;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="M 113.38672,340.15625 L 226.77344,170.07812 L 113.38672,0 L 198.42578,0 L 425.19531,340.15625 L 340.15625,340.15625 L 269.29297,233.85938 L 198.42578,340.15625 L 113.38672,340.15625 z"
+ id="path14" />
+ <path
+ style="fill:#286296;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="M 387.40234,240.94531 L 349.60938,184.25391 L 481.89062,184.25 L 481.89062,240.94531 L 387.40234,240.94531 z"
+ id="path16" />
+ <path
+ style="fill:#286296;fill-opacity:1;fill-rule:nonzero;stroke:none"
+ d="M 330.71094,155.90625 L 292.91406,99.214844 L 481.89062,99.210938 L 481.89062,155.90625 L 330.71094,155.90625 z"
+ id="path18" />
+</svg>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
Deleted file not rendered
Deleted file not rendered
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Deleted file not rendered
@@ -5,7 +5,7 @@
<extension point="org.eclipse.ui.newWizards">
<wizard
name="%newProjectWizard_name"
- icon="icons/etool16/hsicon16.gif"
+ icon="icons/etool16/newhprj_wiz.gif"
category="net.sf.eclipsefp.haskell.ui.newWizardCategory"
class="net.sf.eclipsefp.haskell.ui.wizards.NewHaskellProjectWizard"
finalPerspective="net.sf.eclipsefp.haskell.ui.HaskellPerspective"
@@ -35,7 +35,7 @@
<wizard
category="net.sf.eclipsefp.haskell.ui.importWizardCategory"
class="net.sf.eclipsefp.haskell.ui.internal.wizards.CabalPackageImportWizard"
- icon="icons/etool16/hsicon16.gif"
+ icon="icons/etool16/impcprj_wiz.gif"
id="net.sf.eclipsefp.haskell.ui.internal.wizards.CabalPackageImportWizard"
name="%importCabalPackageWizard_name">
<description>
@@ -50,7 +50,7 @@
<editor
name="%haskellEditor_name"
extensions="hs,lhs"
- icon="icons/etool16/hsicon16.gif"
+ icon="icons/obj16/hsfile_obj.gif"
class="net.sf.eclipsefp.haskell.ui.internal.editors.haskell.HaskellEditor"
contributorClass="org.eclipse.ui.editors.text.TextEditorActionContributor"
id="net.sf.eclipsefp.haskell.ui.internal.editors.haskell.HaskellEditor">
@@ -98,7 +98,7 @@
<extension
point="org.eclipse.ui.ide.projectNatureImages">
<image
- icon="icons/etool16/haskellNature.gif"
+ icon="icons/ovr16/haskell_ovr.gif"
natureId="net.sf.eclipsefp.haskell.core.project.HaskellNature"
id="net.sf.eclipsefp.haskell.core.project.haskellNatureImage">
</image>
@@ -123,7 +123,7 @@
point="org.eclipse.ui.perspectives">
<perspective
name="%haskellPerspective_name"
- icon="icons/etool16/hsicon16.gif"
+ icon="icons/etool16/haskell_misc.gif"
class="net.sf.eclipsefp.haskell.ui.HaskellPerspective"
id="net.sf.eclipsefp.haskell.ui.HaskellPerspective">
</perspective>
@@ -411,7 +411,7 @@
<extension point="org.eclipse.ui.navigator.navigatorContent">
<navigatorContent
name="%navigatorContent_name"
- icon="$nl$/icons/etool16/hsicon16.gif"
+ icon="$nl$/icons/etool16/haskell_misc.gif"
activeByDefault="true"
contentProvider="net.sf.eclipsefp.haskell.ui.internal.views.projectexplorer.HaskellResourceExtensionCP"
labelProvider="net.sf.eclipsefp.haskell.ui.internal.views.projectexplorer.HaskellResourceExtensionLP"
@@ -426,6 +426,7 @@
<instanceof value="org.eclipse.core.resources.IWorkspaceRoot" />
<instanceof value="org.eclipse.core.resources.IProject" />
<instanceof value="org.eclipse.core.resources.IFolder" />
+ <instanceof value="org.eclipse.core.resources.IFile" />
</or>
</triggerPoints>
<possibleChildren>
@@ -12,6 +12,7 @@
import net.sf.eclipsefp.haskell.ui.internal.views.common.ITreeElement;
import net.sf.eclipsefp.haskell.ui.util.HaskellUIImages;
import net.sf.eclipsefp.haskell.ui.util.IImageNames;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IResource;
@@ -82,8 +83,7 @@ private Image getFileImage( final IFile file ) {
if( ResourceUtil.EXTENSION_HS.equals( ext ) ) {
result = HaskellUIImages.getImage( IImageNames.SOURCE_FILE );
} else if( ResourceUtil.EXTENSION_LHS.equals( ext ) ) {
- String key = IImageNames.LITERATE_SOURCE_FILE;
- result = HaskellUIImages.getImage( key );
+ result = HaskellUIImages.getImage( IImageNames.LITERATE_SOURCE_FILE );
}
}
}
@@ -4,8 +4,10 @@
package net.sf.eclipsefp.haskell.ui.internal.wizards;
import java.lang.reflect.InvocationTargetException;
+
import net.sf.eclipsefp.haskell.core.internal.project.ProjectCreationOperation;
import net.sf.eclipsefp.haskell.ui.HaskellUIPlugin;
+
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExecutableExtension;
@@ -5,7 +5,9 @@
import java.net.URL;
import java.util.HashMap;
import java.util.Map;
+
import net.sf.eclipsefp.haskell.ui.HaskellUIPlugin;
+
import org.eclipse.jface.resource.CompositeImageDescriptor;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.resource.ImageRegistry;
@@ -47,9 +49,9 @@ private static void declareImages() {
// objects
declare( LAUNCH_TAB_ARGUMENTS, OBJECT + "arguments_tab.gif" );
declare( IMPORT_LIBRARY, OBJECT + "library.gif" );
- declare( SOURCE_FOLDER, OBJECT + "srcfolder.gif" );
- declare( SOURCE_FILE, OBJECT + "srcfile.gif" );
- declare( LITERATE_SOURCE_FILE, OBJECT + "litsrcfile.gif" );
+ declare( SOURCE_FOLDER, OBJECT + "srcfolder_obj.gif" );
+ declare( SOURCE_FILE, OBJECT + "hsfile_obj.gif" );
+ declare( LITERATE_SOURCE_FILE, OBJECT + "lhsfile_obj.gif" );
declare( PROJECT_EXECUTABLE, OBJECT + "projexe.gif" );
declare( HASKELL_PROJECT, OBJECT + "hsproject.gif" );
declare( EXECUTABLE_STANZA, OBJECT + "executablestanza.gif" ); //$NON-NLS-1$
@@ -93,9 +95,9 @@ private static void declareImages() {
declare( INFIXR_DECL, OBJECT + "infixr.gif" );
// wizard banners
- declare( NEW_PROJECT, WIZARD + "newproject.gif" );
+ declare( NEW_PROJECT, WIZARD + "newhprj_wiz.png" );
declare( NEW_MODULE, WIZARD + "newmodule.png" );
- declare( IMPORT_CABAL_PACKAGE, WIZARD + "importcabalpkg.png" );
+ declare( IMPORT_CABAL_PACKAGE, WIZARD + "impcprj_wiz.png" );
}
private final static void declare( final String key,

0 comments on commit de167a3

Please sign in to comment.