- Timestamp:
- 2016-07-19T20:53:22+02:00 (8 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/geticons.pl
r10561 r10566 37 37 if(($l =~ /(?:icon-image|repeat-image|fill-image)\s*:\s*(\"?(.*?)\"?)\s*;/) && ($1 ne "none")) 38 38 { 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; 43 40 ++$icons{$img}; 44 41 } … … 46 43 { 47 44 my $i = $1; 48 $i = "styles/standard/$i" if $i eq "misc/no_icon";49 45 ++$icons{$i}; 50 46 } -
trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
r10420 r10566 165 165 */ 166 166 public static ImageIcon getNoIcon_Icon(StyleSource source) { 167 return new ImageProvider(" misc/no_icon")167 return new ImageProvider("presets/misc/no_icon") 168 168 .setDirs(getIconSourceDirs(source)) 169 169 .setId("mappaint."+source.getPrefName()) … … 241 241 if (Main.pref.getBoolean("mappaint.icon.enable-defaults", true)) { 242 242 /* 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/"); 245 246 } 246 247 -
trunk/styles/standard/elemstyles.mapcss
r10565 r10566 381 381 way[barrier=retaining_wall], 382 382 way[barrier=kerb] { 383 repeat-image: " misc/cliff-pattern.png";383 repeat-image: "presets/misc/cliff-pattern.png"; 384 384 repeat-image-align: top; 385 385 } … … 1392 1392 way[embankment?][!highway][!railway][!waterway], 1393 1393 way[man_made=embankment][!highway][!railway][!waterway] { 1394 repeat-image: " misc/embankment-pattern.png";1394 repeat-image: "presets/misc/embankment-pattern.png"; 1395 1395 repeat-image-align: top; 1396 1396 width: 1; … … 1403 1403 way[man_made=embankment][railway], 1404 1404 way[man_made=embankment][waterway] { 1405 repeat-image: " misc/embankment-pattern-centered.png";1405 repeat-image: "presets/misc/embankment-pattern-centered.png"; 1406 1406 } 1407 1407 way[man_made=pipeline] { … … 1523 1523 } 1524 1524 node[office=accountant] { 1525 icon-image: "presets/ styles/standard/office/accountant.svg";1525 icon-image: "presets/office/accountant.svg"; 1526 1526 set icon_z17; 1527 1527 } 1528 1528 node[office=administrative] { 1529 icon-image: "presets/ styles/standard/office/administrative.svg";1529 icon-image: "presets/office/administrative.svg"; 1530 1530 set icon_z17; 1531 1531 } 1532 1532 node[office=advertising_agency] { 1533 icon-image: "presets/ styles/standard/office/advertising_agency.svg";1533 icon-image: "presets/office/advertising_agency.svg"; 1534 1534 set icon_z17; 1535 1535 } 1536 1536 node[office=architect] { 1537 icon-image: "presets/ styles/standard/office/architect.svg";1537 icon-image: "presets/office/architect.svg"; 1538 1538 set icon_z17; 1539 1539 } 1540 1540 node[office=association] { 1541 icon-image: "presets/ styles/standard/office/association.svg";1541 icon-image: "presets/office/association.svg"; 1542 1542 set icon_z17; 1543 1543 } 1544 1544 node[office=company] { 1545 icon-image: "presets/ styles/standard/office/private_company.svg";1545 icon-image: "presets/office/private_company.svg"; 1546 1546 set icon_z17; 1547 1547 } 1548 1548 node[office=educational_institution] { 1549 icon-image: "presets/ styles/standard/office/educational_institution.svg";1549 icon-image: "presets/office/educational_institution.svg"; 1550 1550 set icon_z17; 1551 1551 } 1552 1552 node[office=employment_agency] { 1553 icon-image: "presets/ styles/standard/office/employment_agency.svg";1553 icon-image: "presets/office/employment_agency.svg"; 1554 1554 set icon_z17; 1555 1555 } 1556 1556 node[office=estate_agent] { 1557 icon-image: "presets/ styles/standard/office/real_state.svg";1557 icon-image: "presets/office/real_state.svg"; 1558 1558 set icon_z17; 1559 1559 } 1560 1560 node[office=foundation] { 1561 icon-image: "presets/ styles/standard/office/foundation.svg";1561 icon-image: "presets/office/foundation.svg"; 1562 1562 set icon_z17; 1563 1563 } 1564 1564 node[office=insurance] { 1565 icon-image: "presets/ styles/standard/office/insurance.svg";1565 icon-image: "presets/office/insurance.svg"; 1566 1566 set icon_z17; 1567 1567 } 1568 1568 node[office=it] { 1569 icon-image: "presets/ styles/standard/office/it.svg";1569 icon-image: "presets/office/it.svg"; 1570 1570 set icon_z17; 1571 1571 } 1572 1572 node[office=lawyer] { 1573 icon-image: "presets/ styles/standard/office/lawyer.svg";1573 icon-image: "presets/office/lawyer.svg"; 1574 1574 set icon_z17; 1575 1575 } 1576 1576 node[office=newspaper] { 1577 icon-image: "presets/ styles/standard/office/newspaper.svg";1577 icon-image: "presets/office/newspaper.svg"; 1578 1578 set icon_z17; 1579 1579 } 1580 1580 node[office=ngo] { 1581 icon-image: "presets/ styles/standard/office/ong.svg";1581 icon-image: "presets/office/ong.svg"; 1582 1582 set icon_z17; 1583 1583 } 1584 1584 node[office=notary] { 1585 icon-image: "presets/ styles/standard/office/notary.svg";1585 icon-image: "presets/office/notary.svg"; 1586 1586 set icon_z17; 1587 1587 } 1588 1588 node[office=political_party] { 1589 icon-image: "presets/ styles/standard/office/political_party.svg";1589 icon-image: "presets/office/political_party.svg"; 1590 1590 set icon_z17; 1591 1591 } 1592 1592 node[office=religion] { 1593 icon-image: "presets/ styles/standard/office/religion.svg";1593 icon-image: "presets/office/religion.svg"; 1594 1594 set icon_z17; 1595 1595 } 1596 1596 node[office=research] { 1597 icon-image: "presets/ styles/standard/office/research.svg";1597 icon-image: "presets/office/research.svg"; 1598 1598 set icon_z17; 1599 1599 } 1600 1600 node[office=tax_advisor] { 1601 icon-image: "presets/ styles/standard/office/tax_advisor.svg";1601 icon-image: "presets/office/tax_advisor.svg"; 1602 1602 set icon_z17; 1603 1603 } 1604 1604 node[office=telecommunication] { 1605 icon-image: "presets/ styles/standard/office/telecommunication.svg";1605 icon-image: "presets/office/telecommunication.svg"; 1606 1606 set icon_z17; 1607 1607 } 1608 1608 node[office=government] { 1609 icon-image: "presets/ styles/standard/office/government.svg";1609 icon-image: "presets/office/government.svg"; 1610 1610 set icon_z17; 1611 1611 } … … 4026 4026 } 4027 4027 way[natural=cliff] { 4028 repeat-image: " misc/cliff-pattern.png";4028 repeat-image: "presets/misc/cliff-pattern.png"; 4029 4029 repeat-image-align: top; 4030 4030 width: 1;
Note:
See TracChangeset
for help on using the changeset viewer.