Changeset 790 in josm


Ignore:
Timestamp:
2008-08-16T00:12:09+02:00 (16 years ago)
Author:
stoecker
Message:

some cleanup in mappaint and presets

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/build.xml

    r764 r790  
    3131
    3232                <!-- styles -->
    33                 <copy todir="build/styles">
    34                         <fileset dir="styles" />
     33                <copy file="styles/standard/elemstyles.xml" todir="build/styles/standard"/>
     34
     35                <copy todir="build/images/styles/standard">
     36                        <fileset dir="styles/standard/icons" />
    3537                </copy>
    3638

  • trunk/presets/presets.xml

    r728 r790  
    77
    88<annotations>
    9        
    10        
     9
     10        <item name="Streets" icon="presets/way_unknown.png"/>
     11        <item name="Ways" icon="presets/way_unknown.png"/>
     12        <item name="Railway" icon="presets/railway.png"/>
     13        <item name="Waterway" icon="presets/waterway.png"/>
     14        <item name=" " icon="presets/empty.png"/>
     15        <item name="Car" icon="presets/car.png"/>
     16        <item name="Bicycle" icon="presets/bike.png"/>
     17        <item name=" " icon="presets/empty.png"/>
     18        <item name="Accomodation" icon="presets/bed.png"/>
     19        <item name="Food+Drinks" icon="presets/restaurant.png"/>
     20        <item name="Tourism" icon="presets/State_Public.png"/>
     21        <item name="Historic Places" icon="presets/State_Tourist.png"/>
     22        <item name="Leisure" icon="presets/kindergarten.png"/>
     23        <item name="Sport" icon="presets/soccer.png"/>
     24        <item name=" " icon="presets/empty.png"/>
     25        <item name="Buildings" icon="presets/townhall.png"/>
     26        <item name="Amenities" icon="presets/telephone.png"/>
     27        <item name="Cash" icon="presets/dollar.png"/>
     28        <item name="Shops" icon="presets/shopping.png"/>
     29        <item name=" " icon="presets/empty.png"/>
     30        <item name="Places" icon="presets/places.png"/>
     31        <item name="Boundaries" icon="presets/boundaries.png"/>
     32        <item name="Landuse" icon="presets/landuse.png"/>
     33        <item name="Natural" icon="presets/water.png"/>
     34        <item name="Man Made" icon="presets/works.png"/>
     35
    1136        <item name="Streets/Motorway" icon="presets/motorway.png">
    1237                <label text="Edit a Motorway" />
    … …  
    264289                <check key="toll" text="Toll" default="off" delete_if_empty="true"  />
    265290                <check key="noexit" text="No exit (cul-de-sac)" default="off" delete_if_empty="true"  />
    266                 <combo key="access" text="Access" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
     291                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    267292                <combo key="bicycle" text="Bicycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true"  />
    268293                <combo key="foot" text="Foot" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    269294                <combo key="goods" text="Goods" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    270                 <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
     295                <combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    271296                <combo key="horse" text="Horse" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    272297                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    273                 <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
     298                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    274299                <combo key="psv" text="Public Service Vehicles (psv)" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    275300                <combo key="motorboat" text="Motorboat" values="yes,private,designated,destination,permissive,unknown,no" default="" delete_if_empty="true" />
    … …  
    502527                <combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    503528                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     529                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     530                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     531                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    504532                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    505533        </item>
    … …  
    520548                <combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    521549                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     550                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     551                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     552                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    522553                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    523554        </item>
    … …  
    538569                <combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    539570                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     571                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     572                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     573                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    540574                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    541575        </item>
    … …  
    556590                <combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    557591                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     592                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     593                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     594                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    558595                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    559596        </item>
    … …  
    574611                <combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    575612                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     613                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     614                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     615                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    576616                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    577617        </item>
    … …  
    592632                <combo key="surface" text="Surface" values="paved,cobblestone,gravel,ground,grass,sand" default="" delete_if_empty="true" />
    593633                <combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" default="" delete_if_empty="true" />
     634                <combo key="access" text="Access" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     635                <combo key="motorcycle" text="Motorcycle" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
     636                <combo key="motorcar" text="Motorcar" values="yes,private,designated,destination,permissive,agricultural,unknown,no" default="" delete_if_empty="true" />
    594637                <text key="width" text="Width (metres)" default="" delete_if_empty="true" />
    595638        </item>
    … …  
    804847       
    805848       
    806         <item name=" " icon="presets/empty.png"></item>
    807 
    808849        <item name="Car/Fuel" icon="presets/fuel.png">
    809850                <label text="Edit Fuel" />
    … …  
    854895        </item>
    855896
    856         <item name=" " icon="presets/empty.png"></item>
    857897
    858898        <item name="Accomodation/Hotel" icon="presets/bed.png">
    … …  
    13111351        </item>
    13121352       
    1313         <item name=" " icon="presets/empty.png"></item>
    1314 
    13151353        <item name="Buildings/Public Building" icon="presets/empty.png">
    13161354                <label text="Edit Public Building" />
    … …  
    15541592
    15551593
    1556         <item name=" " icon="presets/empty.png"></item>
    1557        
    15581594        <item name="Places/Continent" icon="presets/places.png">
    15591595                <label text="Edit a Continent" />

  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyleHandler.java

    r735 r790  
    8787                                for (int count=0; count<atts.getLength(); count++) {
    8888                                        if (atts.getQName(count).equals("src")) {
    89                                                 String imageFile = MapPaintStyles.getStyleDir()+"icons/"+atts.getValue(count);
     89                                                String imageFile = MapPaintStyles.getImageDir()+atts.getValue(count);
    9090                                                File f = new File(imageFile);
    9191                                                if (f.exists()) {
    … …  
    9494                                                } else {
    9595                                                        try {
    96                                                                 URL path = getClass().getResource("/styles/standard/icons/"+atts.getValue(count));
     96                                                                URL path = getClass().getResource(MapPaintStyles.getImageDir()+atts.getValue(count));
    9797                                                                if (path == null) {
    9898                                                                        /* icon not found, using default */
    9999                                                                        System.out.println("Mappaint: Icon " + atts.getValue(count) + " not found, using default icon");
    100                                                                         path = getClass().getResource("/styles/standard/icons/misc/no_icon.png");
     100                                                                        path = getClass().getResource(MapPaintStyles.getImageDir()+"misc/no_icon.png");
    101101                                                                        curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
    102102                                                                } else {
    … …  
    105105                                                        }
    106106                                                        catch (Exception e){
    107                                                                 URL path = getClass().getResource("/styles/standard/icons/amenity.png");
     107                                                                URL path = getClass().getResource(MapPaintStyles.getImageDir()+"incomming/amenity.png");
    108108                                                                curIcon = new ImageIcon(Toolkit.getDefaultToolkit().createImage(path));
    109109                                                        }

  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

    r736 r790  
    1717
    1818        public static String styleDir;
     19        public static String imageDir;
    1920        private static HashMap<String, ElemStyle> styles = new HashMap<String, ElemStyle>();
    2021       
    … …  
    2223                return styleDir;
    2324        }
     25        public static String getImageDir(){
     26                return imageDir;
     27        }
    2428
    2529        public static void readFromPreferences() {
    2630
    2731                String styleName = Main.pref.get("mappaint.style", "standard");
    28                 styleDir = Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/"; //some day we will support different icon directories over options
     32                styleDir = Main.pref.get("mappaint.styledir", Main.pref.getPreferencesDir()+"plugins/mappaint/"+styleName+"/");
    2933                String elemStylesFile = getStyleDir()+"elemstyles.xml";
     34                imageDir = styleDir+"icons/";
    3035
    3136//              System.out.println("mappaint: Using style: " + styleName);
    … …  
    5762                        if (elemStylesPath != null)
    5863                        {
     64                                imageDir = "/images/styles/standard/";
    5965                                try
    6066                                {
Note: See TracChangeset for help on using the changeset viewer.