Ignore:
Timestamp:
2021-02-05T11:55:54+01:00 (4 years ago)
Author:
DevCharly
Message:

see #19819 - flatlaf: added dark colors for preference tables, conflict solver and history viewer (requires JOSM patch)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/flatlaf/src/org/openstreetmap/josm/plugins/flatlaf/FlatDarkLaf.properties

    r35697 r35699  
    33#
    44
    5 TabbedPane.selectedBackground=darken($TabbedPane.background,5%,derived noAutoInverse)
    6 TabbedPane.hoverColor=darken($TabbedPane.background,7%,derived noAutoInverse)
     5# base colors (same values as Action.* in FlatLaf Dark theme)
     6@JOSM.blue = #3592C4
     7@JOSM.green = #499C54
     8@JOSM.red = #C75450
     9@JOSM.yellow = #F0A732
    710
     11
     12# TabbedPane
     13TabbedPane.selectedBackground = darken($TabbedPane.background,5%,derived noAutoInverse)
     14TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived noAutoInverse)
     15
     16# TwoColumnDiff
     17JOSM.TwoColumnDiff.INSERTED = darken(@JOSM.green,25%)
     18JOSM.TwoColumnDiff.DELETED = darken(@JOSM.red,25%)
     19JOSM.TwoColumnDiff.CHANGED = darken(@JOSM.yellow,30%)
     20JOSM.TwoColumnDiff.REVERSED = darken(@JOSM.yellow,15%)
     21JOSM.TwoColumnDiff.SAME = @textComponentBackground
     22JOSM.TwoColumnDiff.EMPTY = @textComponentBackground
     23
     24# TagTableCellRenderer
     25JOSM.TagTableCellRenderer.BGCOLOR_SELECTED_FOCUS = $Table.selectionBackground
     26JOSM.TagTableCellRenderer.BGCOLOR_SELECTED = $Table.selectionInactiveBackground
     27
     28# CoordinateInfoViewer
     29JOSM.CoordinateInfoViewer.UNMODIFIED = darken(@background,3%)
    830
    931#---- NamedColorProperty ----
    1032
    1133# AbstractTextComponentValidator
    12 JOSM.clr.general.Input\ validation\:\ error=$Component.error.focusedBorderColor
    13 JOSM.clr.general.Input\ validation\:\ error\ background=$Component.error.borderColor
    14 JOSM.clr.general.Input\ validation\:\ warning=$Component.warning.focusedBorderColor
    15 JOSM.clr.general.Input\ validation\:\ warning\ background=$Component.warning.borderColor
    16 JOSM.clr.general.Input\ validation\:\ valid=#62b543
     34JOSM.clr.general.Input\ validation\:\ error = $Component.error.focusedBorderColor
     35JOSM.clr.general.Input\ validation\:\ error\ background = $Component.error.borderColor
     36JOSM.clr.general.Input\ validation\:\ warning = $Component.warning.focusedBorderColor
     37JOSM.clr.general.Input\ validation\:\ warning\ background = $Component.warning.borderColor
     38JOSM.clr.general.Input\ validation\:\ valid = darken(@JOSM.green,10%)
    1739
    1840# ImageryProvidersPanel
    19 JOSM.clr.general.Imagery\ Background\:\ Default=darken(#499c54,10%)
     41JOSM.clr.general.Imagery\ Background\:\ Default = darken(@JOSM.green,20%)
    2042
    2143# MapStatus
    22 JOSM.clr.general.Status\ bar\ background=darken(#b8cfe5,50%)
    23 JOSM.clr.general.Status\ bar\ foreground=@foreground
    24 JOSM.clr.general.Status\ bar\ background\:\ active=darken(#aaff5e,40%)
    25 JOSM.clr.general.Status\ bar\ foreground\:\ active=@foreground
     44JOSM.clr.general.Status\ bar\ background = darken(#b8cfe5,50%)
     45JOSM.clr.general.Status\ bar\ foreground = @foreground
     46JOSM.clr.general.Status\ bar\ background\:\ active = darken(#aaff5e,40%)
     47JOSM.clr.general.Status\ bar\ foreground\:\ active = @foreground
     48
     49# PreferencesTable.SettingCellRenderer
     50JOSM.clr.general.Advanced\ Background\:\ Changed = darken(@JOSM.green,20%)
     51JOSM.clr.general.Advanced\ Background\:\ NonDefault = darken(@JOSM.yellow,30%)
     52
     53# SourceEditor.FancySourceEntryTableCellRenderer
     54JOSM.clr.general.External\ resource\ entry\:\ Active = darken(@JOSM.green,20%)
     55JOSM.clr.general.External\ resource\ entry\:\ Inactive = lighten(@background,20%)
     56
     57# ConflictColors
     58@JOSM.conflict.background = @background
     59@JOSM.conflict.foreground = @foreground
     60@JOSM.conflict.green = darken(@JOSM.green,20%)
     61@JOSM.conflict.blue = darken(@JOSM.blue,25%)
     62@JOSM.conflict.red = darken(@JOSM.red,25%)
     63@JOSM.conflict.orange = darken(@JOSM.yellow,30%)
     64@JOSM.conflict.gray1 = lighten(@JOSM.conflict.background,15%)
     65@JOSM.conflict.gray2 = lighten(@JOSM.conflict.background,30%)
     66
     67JOSM.clr.general.Conflict\ background\:\ no\ conflict = @JOSM.conflict.gray1
     68JOSM.clr.general.Conflict\ background\:\ decided = @JOSM.conflict.green
     69JOSM.clr.general.Conflict\ background\:\ undecided = @JOSM.conflict.red
     70JOSM.clr.general.Conflict\ background\:\ drop = @JOSM.conflict.background
     71JOSM.clr.general.Conflict\ background\:\ keep = @JOSM.conflict.green
     72JOSM.clr.general.Conflict\ background\:\ combined = @JOSM.conflict.green
     73JOSM.clr.general.Conflict\ background\:\ selected = @JOSM.conflict.blue
     74
     75JOSM.clr.general.Conflict\ foreground\:\ undecided = @JOSM.conflict.foreground
     76JOSM.clr.general.Conflict\ foreground\:\ drop = @JOSM.conflict.gray2
     77JOSM.clr.general.Conflict\ foreground\:\ keep = @JOSM.conflict.foreground
     78
     79JOSM.clr.general.Conflict\ background\:\ empty row = @JOSM.conflict.gray1
     80JOSM.clr.general.Conflict\ background\:\ frozen = @JOSM.conflict.gray1
     81JOSM.clr.general.Conflict\ background\:\ in\ comparison = @JOSM.conflict.foreground
     82JOSM.clr.general.Conflict\ foreground\:\ in\ comparison = @JOSM.conflict.background
     83JOSM.clr.general.Conflict\ background = @JOSM.conflict.background
     84JOSM.clr.general.Conflict\ foreground = @JOSM.conflict.foreground
     85
     86JOSM.clr.general.Conflict\ background\:\ not\ in\ opposite = @JOSM.conflict.red
     87JOSM.clr.general.Conflict\ background\:\ in\ opposite = @JOSM.conflict.orange
     88JOSM.clr.general.Conflict\ background\:\ same\ position\ in\ opposite = @JOSM.conflict.green
     89
     90JOSM.clr.general.Conflict\ background\:\ keep\ one\ tag = @JOSM.conflict.green
     91JOSM.clr.general.Conflict\ foreground\:\ keep\ one\ tag = @JOSM.conflict.foreground
     92JOSM.clr.general.Conflict\ background\:\ drop\ tag = @JOSM.conflict.gray2
     93JOSM.clr.general.Conflict\ foreground\:\ drop\ tag = @JOSM.conflict.foreground
     94JOSM.clr.general.Conflict\ background\:\ keep\ all\ tags = @JOSM.conflict.orange
     95JOSM.clr.general.Conflict\ foreground\:\ keep\ all\ tags = @JOSM.conflict.foreground
     96JOSM.clr.general.Conflict\ background\:\ sum\ all\ numeric\ tags = @JOSM.conflict.orange
     97JOSM.clr.general.Conflict\ foreground\:\ sum\ all\ numeric\ tags = @JOSM.conflict.foreground
     98
     99JOSM.clr.general.Conflict\ background\:\ keep\ member = @JOSM.conflict.green
     100JOSM.clr.general.Conflict\ foreground\:\ keep\ member = @JOSM.conflict.foreground
     101JOSM.clr.general.Conflict\ background\:\ remove\ member = @JOSM.conflict.gray2
     102JOSM.clr.general.Conflict\ foreground\:\ remove\ member = @JOSM.conflict.foreground
Note: See TracChangeset for help on using the changeset viewer.