Changeset 10566 in josm


Ignore:
Timestamp:
2016-07-19T20:53:22+02:00 (17 months ago)
Author:
stoecker
Message:

see #13084 - fix some errors in icon move

Location:
trunk
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/geticons.pl

    r10561 r10566  
    3737      if(($l =~ /(?:icon-image|repeat-image|fill-image)\s*:\s*(\"?(.*?)\"?)\s*;/) && ($1 ne "none"))
    3838      {
    39         my $val = $2;
    40         my $img = "styles/standard/$val";
    41         $img = "styles/$val" if((!-f "images/$img") && -f "images/styles/$val");
    42         $img = $val if((!-f "images/$img") && -f "images/$val");
     39        my $img = $2;
    4340        ++$icons{$img};
    4441      }
     
    4643      {
    4744        my $i = $1;
    48         $i = "styles/standard/$i" if $i eq "misc/no_icon";
    4945        ++$icons{$i};
    5046      }
  • trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java

    r10420 r10566  
    165165     */
    166166    public static ImageIcon getNoIcon_Icon(StyleSource source) {
    167         return new ImageProvider("misc/no_icon")
     167        return new ImageProvider("presets/misc/no_icon")
    168168                .setDirs(getIconSourceDirs(source))
    169169                .setId("mappaint."+source.getPrefName())
     
    241241        if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) {
    242242            /* don't prefix icon path, as it should be generic */
    243             dirs.add("resource://images/styles/standard/");
    244             dirs.add("resource://images/styles/");
     243            dirs.add("resource://images/");
     244            // FIXME: WORKAROUND for path change, remove this line in August 2016
     245            dirs.add("resource://images/presets/");
    245246        }
    246247
  • trunk/styles/standard/elemstyles.mapcss

    r10565 r10566  
    381381way[barrier=retaining_wall],
    382382way[barrier=kerb] {
    383     repeat-image: "misc/cliff-pattern.png";
     383    repeat-image: "presets/misc/cliff-pattern.png";
    384384    repeat-image-align: top;
    385385}
     
    13921392way[embankment?][!highway][!railway][!waterway],
    13931393way[man_made=embankment][!highway][!railway][!waterway] {
    1394     repeat-image: "misc/embankment-pattern.png";
     1394    repeat-image: "presets/misc/embankment-pattern.png";
    13951395    repeat-image-align: top;
    13961396    width: 1;
     
    14031403way[man_made=embankment][railway],
    14041404way[man_made=embankment][waterway] {
    1405     repeat-image: "misc/embankment-pattern-centered.png";
     1405    repeat-image: "presets/misc/embankment-pattern-centered.png";
    14061406}
    14071407way[man_made=pipeline] {
     
    15231523}
    15241524node[office=accountant] {
    1525     icon-image: "presets/styles/standard/office/accountant.svg";
     1525    icon-image: "presets/office/accountant.svg";
    15261526    set icon_z17;
    15271527}
    15281528node[office=administrative] {
    1529     icon-image: "presets/styles/standard/office/administrative.svg";
     1529    icon-image: "presets/office/administrative.svg";
    15301530    set icon_z17;
    15311531}
    15321532node[office=advertising_agency] {
    1533     icon-image: "presets/styles/standard/office/advertising_agency.svg";
     1533    icon-image: "presets/office/advertising_agency.svg";
    15341534    set icon_z17;
    15351535}
    15361536node[office=architect] {
    1537     icon-image: "presets/styles/standard/office/architect.svg";
     1537    icon-image: "presets/office/architect.svg";
    15381538    set icon_z17;
    15391539}
    15401540node[office=association] {
    1541     icon-image: "presets/styles/standard/office/association.svg";
     1541    icon-image: "presets/office/association.svg";
    15421542    set icon_z17;
    15431543}
    15441544node[office=company] {
    1545     icon-image: "presets/styles/standard/office/private_company.svg";
     1545    icon-image: "presets/office/private_company.svg";
    15461546    set icon_z17;
    15471547}
    15481548node[office=educational_institution] {
    1549     icon-image: "presets/styles/standard/office/educational_institution.svg";
     1549    icon-image: "presets/office/educational_institution.svg";
    15501550    set icon_z17;
    15511551}
    15521552node[office=employment_agency] {
    1553     icon-image: "presets/styles/standard/office/employment_agency.svg";
     1553    icon-image: "presets/office/employment_agency.svg";
    15541554    set icon_z17;
    15551555}
    15561556node[office=estate_agent] {
    1557     icon-image: "presets/styles/standard/office/real_state.svg";
     1557    icon-image: "presets/office/real_state.svg";
    15581558    set icon_z17;
    15591559}
    15601560node[office=foundation] {
    1561     icon-image: "presets/styles/standard/office/foundation.svg";
     1561    icon-image: "presets/office/foundation.svg";
    15621562    set icon_z17;
    15631563}
    15641564node[office=insurance] {
    1565     icon-image: "presets/styles/standard/office/insurance.svg";
     1565    icon-image: "presets/office/insurance.svg";
    15661566    set icon_z17;
    15671567}
    15681568node[office=it] {
    1569     icon-image: "presets/styles/standard/office/it.svg";
     1569    icon-image: "presets/office/it.svg";
    15701570    set icon_z17;
    15711571}
    15721572node[office=lawyer] {
    1573     icon-image: "presets/styles/standard/office/lawyer.svg";
     1573    icon-image: "presets/office/lawyer.svg";
    15741574    set icon_z17;
    15751575}
    15761576node[office=newspaper] {
    1577     icon-image: "presets/styles/standard/office/newspaper.svg";
     1577    icon-image: "presets/office/newspaper.svg";
    15781578    set icon_z17;
    15791579}
    15801580node[office=ngo] {
    1581     icon-image: "presets/styles/standard/office/ong.svg";
     1581    icon-image: "presets/office/ong.svg";
    15821582    set icon_z17;
    15831583}
    15841584node[office=notary] {
    1585     icon-image: "presets/styles/standard/office/notary.svg";
     1585    icon-image: "presets/office/notary.svg";
    15861586    set icon_z17;
    15871587}
    15881588node[office=political_party] {
    1589     icon-image: "presets/styles/standard/office/political_party.svg";
     1589    icon-image: "presets/office/political_party.svg";
    15901590    set icon_z17;
    15911591}
    15921592node[office=religion] {
    1593     icon-image: "presets/styles/standard/office/religion.svg";
     1593    icon-image: "presets/office/religion.svg";
    15941594    set icon_z17;
    15951595}
    15961596node[office=research] {
    1597     icon-image: "presets/styles/standard/office/research.svg";
     1597    icon-image: "presets/office/research.svg";
    15981598    set icon_z17;
    15991599}
    16001600node[office=tax_advisor] {
    1601     icon-image: "presets/styles/standard/office/tax_advisor.svg";
     1601    icon-image: "presets/office/tax_advisor.svg";
    16021602    set icon_z17;
    16031603}
    16041604node[office=telecommunication] {
    1605     icon-image: "presets/styles/standard/office/telecommunication.svg";
     1605    icon-image: "presets/office/telecommunication.svg";
    16061606    set icon_z17;
    16071607}
    16081608node[office=government] {
    1609     icon-image: "presets/styles/standard/office/government.svg";
     1609    icon-image: "presets/office/government.svg";
    16101610    set icon_z17;
    16111611}
     
    40264026}
    40274027way[natural=cliff] {
    4028     repeat-image: "misc/cliff-pattern.png";
     4028    repeat-image: "presets/misc/cliff-pattern.png";
    40294029    repeat-image-align: top;
    40304030    width: 1;
Note: See TracChangeset for help on using the changeset viewer.